diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index c796d98c..bd65cc51 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -1845,6 +1845,9 @@ public class TaskServiceImpl implements ITaskService { Map taskStatisticsMap = new HashMap<>(); List commonCompleteStatisticsFromTask = new ArrayList<>(); for (SpdmTaskVo taskVo : taskList) { + if (StringUtils.isBlank(taskVo.getDiscipline())) { + continue; + } CommonGetCompleteFromTaskVo commonGetCompleteFromTaskVo = new CommonGetCompleteFromTaskVo(); commonGetCompleteFromTaskVo.setNodeName(taskVo.getDiscipline()); commonGetCompleteFromTaskVo.setExeStatus(taskVo.getExeStatus()); @@ -1985,6 +1988,9 @@ public class TaskServiceImpl implements ITaskService { if ("tag6".equals(resultTagType)) { for (PerformanceNodePo performanceNodePo : performanceList) { eachTaskVo = taskMap.get(performanceNodePo.getTaskId()); + if (StringUtils.isBlank(eachTaskVo.getDiscipline())) { + continue; + } CommonGetCompleteFromPerformanceVo commonGetCompleteFromPerformanceVo = new CommonGetCompleteFromPerformanceVo(); commonGetCompleteFromPerformanceVo.setNodeName(eachTaskVo.getDiscipline()); commonGetCompleteFromPerformanceVo.setCompleteStatus(StringUtils.isNotBlank(performanceNodePo.getCompleteStatus()) ? @@ -2794,6 +2800,9 @@ public class TaskServiceImpl implements ITaskService { Map taskStatisticsMap = new HashMap<>(); List commonCompleteStatisticsFromTask = new ArrayList<>(); for (SpdmTaskVo taskVo : taskList) { + if (StringUtils.isBlank(taskVo.getDiscipline())) { + continue; + } CommonGetCompleteFromTaskVo commonGetCompleteFromTaskVo = new CommonGetCompleteFromTaskVo(); commonGetCompleteFromTaskVo.setNodeName(taskVo.getDiscipline()); commonGetCompleteFromTaskVo.setExeStatus(taskVo.getExeStatus());