shudonghui 1 år sedan
förälder
incheckning
0d66e0c65c

+ 2 - 2
sop-business/src/main/java/com/qmth/sop/business/service/impl/SopScheduleServiceImpl.java

@@ -45,9 +45,9 @@ public class SopScheduleServiceImpl extends ServiceImpl<SopScheduleMapper, TBSop
         if (group.equals(SopAnalyseGroupEnum.POPULATION)) {
             result.put("POPULATION", processData(list,group));
         } else if (group.equals(SopAnalyseGroupEnum.REGION)) {
-            list.stream().collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> result.put(k.toString(), processData(v,group)));
+            list.stream().filter(map->map.get("region_name")!=null).collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> result.put(k.toString(), processData(v,group)));
         } else if (group.equals(SopAnalyseGroupEnum.SUPPLIER)) {
-            list.stream().collect(Collectors.groupingBy(map -> map.get("name"))).forEach((k, v) -> result.put(k.toString(), processData(v,group)));
+            list.stream().filter(map->map.get("name")!=null).collect(Collectors.groupingBy(map -> map.get("name"))).forEach((k, v) -> result.put(k.toString(), processData(v,group)));
         }
         return result;
     }