From a00bc60443f82cd30d5ad1241462ae35af87e15c Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Mon, 30 Mar 2026 13:30:28 +0800
Subject: [PATCH] =?UTF-8?q?fix[project]:=20getTaskRunTree=E3=80=81getChild?=
 =?UTF-8?q?renNodeList=E5=88=A9=E5=85=83=E4=BA=A8=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=85=BC=E5=AE=B9=E5=BE=85=E5=AD=97=E6=AF=8D?=
 =?UTF-8?q?=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/NodeServiceImpl.java    | 12 +++++++++++-
 .../service/impl/SimulationRunServiceImpl.java       | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
index e43c2c13..3049de18 100644
--- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
@@ -1822,6 +1822,16 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
         }
     }
 
+    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 List<ProjectNodePo> sortWorkspaceNode(List<ProjectNodePo> workspaceNodeList) {
         // 对工位进行排序，-M工位顺序排第一个
         List<ProjectNodePo> sortWorkspaceNodeList = workspaceNodeList.stream().filter(node -> !node.getNodeCode().contains("-M")).collect(Collectors.toList());
@@ -1829,7 +1839,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
             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;
             }
 
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 e170a2e6..993a2b01 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
@@ -672,6 +672,16 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
         return false;
     }
 
+    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;
+        }
+    }
+
     private void sortWorkspaceNode(ProjectNodePo projectNodePo) {
         List<NodeAllBase> children = projectNodePo.getChildren();
         if (CollectionUtils.isEmpty(children)) {
@@ -718,7 +728,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
 
         workspaceNodeList.sort((o1, o2) -> {
 
-            if (o1.getNodeCode().contains("-M") || o2.getNodeCode().contains("-M")) {
+            if (!isInteger(o1.getNodeCode()) || !isInteger(o2.getNodeCode())) {
                 return 0;
             }