fix bug

sop-business/src/main/java/com/qmth/sop/business/service/impl/CrmProgressMonitorServiceImpl.java

@@ -49,6 +49,9 @@ public class CrmProgressMonitorServiceImpl extends ServiceImpl<CrmProgressMonito
 
             //按照不同的类别设置大区经理、供应商、区域协调人
             if (monitorEnum.equals(CrmProgressMonitorEnum.BY_LEAD)) {
+                if (list.get(0) == null || list.get(1) == null) {
+                    continue;
+                }
                 result.setLeadId(Long.valueOf(String.valueOf(list.get(0))));
                 result.setLeadName(String.valueOf(list.get(1)));
             } else if (monitorEnum.equals(CrmProgressMonitorEnum.BY_SUPPLIER)) {
@@ -67,9 +70,9 @@ public class CrmProgressMonitorServiceImpl extends ServiceImpl<CrmProgressMonito
         for (CrmProgressResult result : resultList) {
 
             List<CrmProgressSopResult> filterSopList;
-            if (monitorEnum.equals(CrmProgressMonitorEnum.BY_LEAD)) {
+            if (monitorEnum.equals(CrmProgressMonitorEnum.BY_LEAD) && result.getLeadId() != null) {
                 filterSopList = sopList.stream()
-                        .filter(item -> item.getLeadId().equals(result.getLeadId()))
+                        .filter(item -> item.getLeadId() != null && item.getLeadId().equals(result.getLeadId()))
                         .collect(Collectors.toList());
             } else if (monitorEnum.equals(CrmProgressMonitorEnum.BY_SUPPLIER)) {
                 filterSopList = sopList.stream()

sop-business/src/main/java/com/qmth/sop/business/service/impl/SopWarnMonitorServiceImpl.java

@@ -52,6 +52,9 @@ public class SopWarnMonitorServiceImpl extends ServiceImpl<SopWarnMonitorMapper,
             List<SopWarnMonitorDetailResult> detailList = entry.getValue();
 
             if (type.equals(CrmProgressMonitorEnum.BY_LEAD)) {
+                if (leadList.get(0) == null || leadList.get(1) == null) {
+                    continue;
+                }
                 result.setLeadId(Long.parseLong(leadList.get(0).toString()));
                 result.setLeadName(leadList.get(1).toString());
             } else if (type.equals(CrmProgressMonitorEnum.BY_SUPPLIER)) {
@@ -72,9 +75,9 @@ public class SopWarnMonitorServiceImpl extends ServiceImpl<SopWarnMonitorMapper,
         for (SopWarnMonitorResult result : resultList) {
             List<SopWarnMonitorDetailResult> filterWarnList = new ArrayList<>();
 
-            if (type.equals(CrmProgressMonitorEnum.BY_LEAD)) {
+            if (type.equals(CrmProgressMonitorEnum.BY_LEAD) && result.getLeadId() != null) {
                 filterWarnList = warnDetailList.stream()
-                        .filter(item -> item.getLeadId().equals(result.getLeadId()))
+                        .filter(item -> item.getLeadId() != null && item.getLeadId().equals(result.getLeadId()))
                         .collect(Collectors.toList());
             } else if (type.equals(CrmProgressMonitorEnum.BY_SUPPLIER)) {
                 filterWarnList = warnDetailList.stream()