From 8317b543cd88e0a622b83cce4c2db201384a845f Mon Sep 17 00:00:00 2001
From: lilin <succ_secret@163.com>
Date: Wed, 7 May 2025 10:15:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9A=84=E6=97=B6=E5=80=99=E4=B9=9F=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=B9=9F=E9=9C=80=E8=A6=81=E6=BB=A1=E8=B6=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TsNodesServiceImpl.java      |  3 ++-
 .../service/impl/NodesServiceImpl.java        | 23 ++++++-------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsNodesServiceImpl.java b/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsNodesServiceImpl.java
index fa3bd34..866d39f 100644
--- a/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsNodesServiceImpl.java
+++ b/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsNodesServiceImpl.java
@@ -347,7 +347,8 @@ public class TsNodesServiceImpl extends ServiceImpl<TsNodesMapper, TsNodes> impl
         //判断节点名称是否存在
         QueryWrapper<TsNodes> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("node_name", tsnodes.getNodeName());//名称
-        queryWrapper.eq("parent_id", tsnodes.getParentId());//父节点
+        queryWrapper.eq("task_id", tsnodes.getTaskId());//所属任务ID
+        queryWrapper.eq("parent_id", tsnodes.getParentId());//所属任务ID
         int count = tsNodesMapper.selectCount(queryWrapper);
         // 大于0说明 区域名称重复
         if (count > 0) {
diff --git a/java/src/main/java/com/yfd/platform/modules/specialDocument/service/impl/NodesServiceImpl.java b/java/src/main/java/com/yfd/platform/modules/specialDocument/service/impl/NodesServiceImpl.java
index f5c9222..18a2396 100644
--- a/java/src/main/java/com/yfd/platform/modules/specialDocument/service/impl/NodesServiceImpl.java
+++ b/java/src/main/java/com/yfd/platform/modules/specialDocument/service/impl/NodesServiceImpl.java
@@ -369,9 +369,13 @@ public class NodesServiceImpl extends ServiceImpl<NodesMapper, Nodes> implements
         nodes.setCreator(loginuser.getUsername());
 
         //判断节点名称是否存在
-        QueryWrapper<Nodes> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("node_name", nodes.getNodeName());
-        queryWrapper.eq("parent_id", nodes.getParentId());//父节点
+        LambdaQueryWrapper<Nodes> queryWrapper = new LambdaQueryWrapper<>();
+        //名称
+        queryWrapper.eq(Nodes::getNodeName, nodes.getNodeName());
+        //父节点
+        queryWrapper.eq(Nodes::getParentId, nodes.getParentId());
+        //所属项目ID
+        queryWrapper.eq(Nodes::getProjectId, nodes.getProjectId());
         int count = nodesMapper.selectCount(queryWrapper);
         // 大于0说明 区域名称重复
         if (count > 0) {
@@ -591,19 +595,6 @@ public class NodesServiceImpl extends ServiceImpl<NodesMapper, Nodes> implements
             nodesMapper.deleteById(child.getId());
         }
     }
-//
-//
-//
-//        // 使用 QueryWrapper 查询当前节点的所有子节点
-//        QueryWrapper<Nodes> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("parent_id", parentId); // parent_id = #{parentId}
-//        List<Nodes> children = nodesMapper.selectList(queryWrapper);
-//
-//        // 递归删除每个子节点
-//        for (Nodes child : children) {
-//            deleteChildren(child.getId()); // 递归删除子节点的子节点
-//            nodesMapper.deleteById(child.getId()); // 删除当前子节点
-//        }
 
 
 }
\ No newline at end of file