From e285c1ce6a8957b8f08dcdceeeac222e9aaff961 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Thu, 5 Mar 2026 15:10:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BB=BF=E7=9C=9F=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=9C=89=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=9A=84=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectServiceImpl.java | 3 +++ .../service/impl/SimulationRunServiceImpl.java | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index 0d8fd39c..7c7c80c3 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -615,6 +615,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { } List workspaceNodeList = children.stream().filter(node -> NodeTypeEnum.WORKSPACE.getValue().equals(node.getNodeType())).collect(Collectors.toList()); if (CollectionUtils.isEmpty(workspaceNodeList)) { + for (NodeAllBase child : children) { + sortWorkspaceNode((ProjectNodePo) child); + } return; } // 对工位进行排序，-M工位顺序排第一个 diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index b5dde673..200f115b 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -615,8 +615,24 @@ public class SimulationRunServiceImpl extends ServiceImpl workspaceNodeList = children.stream().filter(node -> NodeTypeEnum.WORKSPACE.getValue().equals(node.getNodeType())).collect(Collectors.toList()); if (CollectionUtils.isEmpty(workspaceNodeList)) { + for (NodeAllBase child : children) { + sortWorkspaceNode((ProjectNodePo) child); + } return; } + // 只显示有任务的工位 + Iterator workspaceNodeListIterator = workspaceNodeList.iterator(); + while (workspaceNodeListIterator.hasNext()) { + List childrenNodeList = workspaceNodeListIterator.next().getChildren(); + if (CollectionUtils.isEmpty(childrenNodeList)) { + workspaceNodeListIterator.remove(); + continue; + } + List taskNodeList = childrenNodeList.stream().filter(node -> NodeTypeEnum.TASK.getValue().equals(node.getNodeType())).toList(); + if (CollectionUtils.isEmpty(taskNodeList)) { + workspaceNodeListIterator.remove(); + } + } // 对工位进行排序，-M工位顺序排第一个 workspaceNodeList = workspaceNodeList.stream().sorted(Comparator.comparing(NodeAllBase::getNodeCode)).collect(Collectors.toList()); NodeAllBase specialWorkspaceNode = workspaceNodeList.stream().filter(workspaceNode -> workspaceNode.getNodeCode().contains("-M")).findFirst().orElse(null);