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 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; }