预案演练 普通案例不推荐行社优秀的 不在待办中显示

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -1306,7 +1306,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             List<AppResumptionDataInfoVo> allDayInfo = getItems(allDayDataList);
             Map<Long, List<AppResumptionDataInfoVo>> afterf = allDayInfo.stream().collect(Collectors.groupingBy(AppResumptionDataInfoVo::getItemId));
             data.put(DictUtils.getDictLabel(DictConstants.RESUMPTION_PLAN_EXEC, 1), getResult(afterf));
-            String tempSubmitNames=  allDayDataList.stream().map(Resumption::getSubmitorName).distinct().collect(Collectors.joining(","));
+            String tempSubmitNames=  allDayDataList.stream().map(Resumption::getSubmitorName).distinct().filter(x->ObjectUtil.isNotEmpty(x)).collect(Collectors.joining(","));
             if("null".equals(tempSubmitNames))
             {
                 tempSubmitNames=StringUtils.EMPTY;
@@ -1338,7 +1338,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         List<AppResumptionDataInfoVo> notWorkTimeInfo = getItems(dataList);
         Map<Long, List<AppResumptionDataInfoVo>> afterf = notWorkTimeInfo.stream().collect(Collectors.groupingBy(AppResumptionDataInfoVo::getItemId));
         data.put(DictUtils.getDictLabel(DictConstants.RESUMPTION_PLAN_EXEC, 5), getResult(afterf));
-        String tempSubmitNames= dataList.stream().map(Resumption::getSubmitorName).distinct().collect(Collectors.joining(","));
+        String tempSubmitNames= dataList.stream().map(Resumption::getSubmitorName).distinct().filter(x->ObjectUtil.isNotEmpty(x)).collect(Collectors.joining(","));
         if("null".equals(tempSubmitNames))
         {
             tempSubmitNames=StringUtils.EMPTY;
@@ -1389,8 +1389,12 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         submiterNames.addAll(ing.stream().map(x -> x.getSubmitorName()).collect(Collectors.toList()));
         submiterNames.addAll(after.stream().map(x -> x.getSubmitorName()).collect(Collectors.toList()));
         submiterNames = submiterNames.stream().distinct().collect(Collectors.toList());
+        if(ObjectUtil.isNotEmpty(submiterNames))
+        {
+            submiterNames= submiterNames.stream().filter(x->ObjectUtil.isNotEmpty(x)).collect(Collectors.toList());
+        }
         String tempSubmitNames= String.join("，", submiterNames);
-        if("null".equals(tempSubmitNames))
+        if("null".equals(tempSubmitNames) || StringUtils.isEmpty(tempSubmitNames))
         {
             tempSubmitNames=StringUtils.EMPTY;
         }