Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -285,31 +285,33 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             }
         }
         for (VinListsVo vinListsVo : vinListsVos) {
-            BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
-            String vinSid = vinListsVo.getVinSid();
-            if (spVehSids.contains(vinSid)){
-                continue;
-            }
-            BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
-            BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
-            busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
-            busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
-            busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
-            busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
-            if (baseVehicleCertificateVo != null){
-                busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
-                busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
-            }else {
-                busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
-                busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
+            if (StringUtils.isNotBlank(vinListsVo.getVinSid())){
+                BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
+                String vinSid = vinListsVo.getVinSid();
+                if (spVehSids.contains(vinSid)){
+                    continue;
+                }
+                BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
+                BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
+                busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
+                busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
+                busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
+                busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
+                if (baseVehicleCertificateVo != null){
+                    busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
+                    busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+                }else {
+                    busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
+                    busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
+                }
+                busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
+                busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
+                busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
+                busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
+                busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
+                busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
+                busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
             }
-            busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
-            busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
-            busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
-            busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
-            busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
-            busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
-            busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
         }
         if (busSalesOrderReturnVehApplyECTJ != null){
             if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")){