【需求】增加空判断

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java

@@ -252,6 +252,9 @@ public class ChanjetManager {
             if(CollUtil.isNotEmpty(result.getData())){
 
                 List<QueryPartnerResVO> dataList = result.getData().stream().filter(vo -> vo.getPartnerType().getName().indexOf("客户") > -1).collect(Collectors.toList());
+
+                if(CollUtil.isNotEmpty(dataList)){
+
                     Map<Long, List<QueryPartnerResVO>> dataGroupById = dataList.stream().collect(Collectors.groupingBy(QueryPartnerResVO::getID));
 
                     List<CustomerDO> customerDOList = customerMapper.selectList(new LambdaQueryWrapper<CustomerDO>() {{
@@ -298,6 +301,9 @@ public class ChanjetManager {
                 }else{
                     maxTs = null;
                 }
+            }else{
+                maxTs = null;
+            }
 
         }while (maxTs != null);
 
@@ -320,6 +326,8 @@ public class ChanjetManager {
             if(CollUtil.isNotEmpty(result.getData())){
 
                 List<QueryPartnerResVO> dataList = result.getData().stream().filter(vo -> vo.getPartnerType().getName().indexOf("供应商") > -1).collect(Collectors.toList());
+
+                if(CollUtil.isNotEmpty(dataList)){
                     Map<Long, List<QueryPartnerResVO>> dataGroupById = dataList.stream().collect(Collectors.groupingBy(QueryPartnerResVO::getID));
 
                     List<SupplierDO> doList = supplierMapper.selectList(new LambdaQueryWrapper<SupplierDO>() {{
@@ -367,6 +375,10 @@ public class ChanjetManager {
                     maxTs = null;
                 }
 
+            }else{
+                maxTs = null;
+            }
+
         }while (maxTs != null);
 
     }