Merge remote-tracking branch 'origin/master'

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

@@ -285,6 +285,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             }
         }
         for (VinListsVo vinListsVo : vinListsVos) {
+            if (StringUtils.isNotBlank(vinListsVo.getVinSid())){
                 BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
                 String vinSid = vinListsVo.getVinSid();
                 if (spVehSids.contains(vinSid)){
@@ -311,6 +312,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
                 busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
             }
+        }
         if (busSalesOrderReturnVehApplyECTJ != null){
             if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")){
                 BusSalesOrderReturnVehApplyDetailsVo data = fetchDetailsVoBySid(busSalesOrderReturnVehApplyECTJ.getSid()).getData();