From 37d3e4e47c325b690e84cf1e19d7fc5987a99e67 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Fri, 27 Mar 2026 09:42:37 +0800 Subject: [PATCH] =?UTF-8?q?fix[project]:=20getTaskTree=E5=88=A9=E5=85=83?= =?UTF-8?q?=E4=BA=A8=E6=8E=92=E5=BA=8F=E5=B7=A5=E4=BD=8D=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E5=BE=85=E5=AD=97=E6=AF=8D=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdm/project/service/impl/ProjectServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 cda96139..7bc2601f 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 @@ -690,6 +690,16 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { return SdmResponse.success(realTopProjectNodeList.stream().flatMap(item -> item.getChildren().stream().filter(Objects::nonNull)).toList()); } + public static boolean isInteger(String str) { + if (str == null || str.trim().isEmpty()) return false; + try { + Long.parseLong(str); // 支持前导零 + return true; + } catch (NumberFormatException e) { + return false; + } + } + public void sortWorkspaceNode(ProjectNodePo projectNodePo) { List children = projectNodePo.getChildren(); if (CollectionUtils.isEmpty(children)) { @@ -709,7 +719,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { String[] workspaceNode1 = o1.getNodeCode().split("-"); String[] workspaceNode2 = o2.getNodeCode().split("-"); - if (o1.getNodeCode().contains("-M") || o2.getNodeCode().contains("-M")) { + if (!isInteger(o1.getNodeCode()) || !isInteger(o2.getNodeCode())) { return 0; }