From 214f22ae3afc686d7f608e949d7d6e523b80262c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 27 Mar 2024 10:51:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=9C=80?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B=E7=9A=84=EF=BC=8C=E8=8B=A5?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E4=B8=8A=E8=A3=85=EF=BC=8C=E5=88=99=E4=B8=8A?=
 =?UTF-8?q?=E8=A3=85=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java | 2 ++
 .../biz/bussalesordermodel/BusSalesOrderModelService.java       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index b43d5f655d..32a0aeaa64 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -1876,6 +1876,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         } else {
                             vo.setMain(true);
                         }
+                    }else{
+                        vo.setMain(true);
                     }
                 }
             } else {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
index 190cf12224..40bc874235 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
@@ -692,7 +692,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             }
             List<BusSalesVehicleOrder> orderList = busSalesVehicleOrderService.selectByOrderSid(salesOrderSid);
             orderList.removeAll(Collections.singleton(null));
-            if (vinList.size() > 0) {
+            if (orderList.size() > 0) {
                 List<String> topSidLists = orderList.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList());
                 if (topSidLists.size() > 0) {
                     //清除上装信息