From faba7822369a97cab10b748e1840f8790ab500c9 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Mon, 19 Jan 2026 14:19:09 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=AD=A6=E7=A7=91=E7=9B=B8=E5=85=B3=E7=BB=9F=E8=AE=A1=E5=9B=BE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sdm/project/service/impl/TaskServiceImpl.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

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<String, CommonStatisticsVo> taskStatisticsMap = new HashMap<>();
             List<CommonGetCompleteFromTaskVo> 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<String, CommonStatisticsVo> taskStatisticsMap = new HashMap<>();
             List<CommonGetCompleteFromTaskVo> 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());