From e97036844948b972c6698943fc586f6de0d4d8b5 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Fri, 17 Oct 2025 11:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=BB=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8bug=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/TaskServiceImpl.java | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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 488443b4..e8d3fa7a 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
@@ -80,19 +80,21 @@ public class TaskServiceImpl implements ITaskService {
             return SdmResponse.failed("任务列表中的idMap不能为空");
         }
         if (idMapList.stream().anyMatch(idMap -> StringUtils.isNotBlank(idMap.getKey()))) {
+            List<TaskNodeTag> realIdMapList = idMapList.stream().filter(idMap -> StringUtils.isNotBlank(idMap.getKey())).toList();
+            TaskNodeTag realTaskNodeTag = realIdMapList.get(realIdMapList.size() - 1);
+            log.info("实际查询节点类型为：{}", realTaskNodeTag);
             String currentNodeTagId = "";
-            for (TaskNodeTag taskNodeTag : idMapList) {
-                for (SpdmTaskVo spdmTaskVo : allTaskList) {
-                    try {
-                        currentNodeTagId = getTagProperty(spdmTaskVo, taskNodeTag.getValue().replace("T", "t"));
-                        if (StringUtils.isNotBlank(currentNodeTagId) && StringUtils.isNotBlank(taskNodeTag.getKey()) && currentNodeTagId.contains(taskNodeTag.getKey())) {
-                            taskList.add(spdmTaskVo);
-                        }
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
+            for (SpdmTaskVo spdmTaskVo : allTaskList) {
+                try {
+                    currentNodeTagId = getTagProperty(spdmTaskVo, realTaskNodeTag.getValue().replace("T", "t"));
+                    if (StringUtils.isNotBlank(currentNodeTagId) && currentNodeTagId.contains(realTaskNodeTag.getKey())) {
+                        taskList.add(spdmTaskVo);
                     }
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
                 }
             }
+
         } else {
             taskList = allTaskList;
         }