From 62840118c8298c96d6f6c408f68e2853b807726b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 1 Dec 2023 14:40:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BD=93=E7=B3=BB=E6=A0=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BC=96=E8=BE=91=E6=94=B9=E4=B8=BA=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E5=AD=90=E9=9B=86=E4=B8=8B=E4=B8=8D=E8=83=BD=E9=87=8D=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsTreeNodeServiceImpl.java   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java
index 3a16c8f9..d9b3a92d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java
@@ -112,12 +112,14 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
     @Override
     public void saveTreeNodeData(LawsTreeNode lawsTreeNode) {
         if (lawsTreeNode != null) {
-            if (lawsTreeNode.getParentId() == null) {
+            String parentId = lawsTreeNode.getParentId();
+            if (parentId == null) {
                 lawsTreeNode.setParentId("");
             }
             // 对名称判重
             LambdaQueryWrapper<LawsTreeNode> query = new LambdaQueryWrapper<>();
             query.eq(LawsTreeNode::getNodeName, lawsTreeNode.getNodeName());
+            query.eq(LawsTreeNode::getParentId, parentId);
             query.eq(LawsTreeNode::getModuleCode, lawsTreeNode.getModuleCode());
             query.eq(LawsTreeNode::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
             List<LawsTreeNode> lawsTreeNodes = this.list(query);
@@ -129,7 +131,6 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
             lawsTreeNode.setId(s);
 			// 先判断该对象有无父级ID,有则意味着不是最高级,否则意味着是最高级
 			// 获取父级ID
-			String parentId = lawsTreeNode.getParentId();
 			String moduleCode = lawsTreeNode.getModuleCode();
 			//update-begin--Author:baihailong  Date:20191209 for：部门编码规则生成器做成公用配置
 			JSONObject formData = new JSONObject();
@@ -149,6 +150,18 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
     @Override
     public boolean updateTreeNodeDataById(LawsTreeNode lawsTreeNode) {
         if (lawsTreeNode != null) {
+            String parentId = lawsTreeNode.getParentId();
+            LambdaQueryWrapper<LawsTreeNode> query = new LambdaQueryWrapper<>();
+            query.eq(LawsTreeNode::getNodeName, lawsTreeNode.getNodeName());
+            query.eq(LawsTreeNode::getParentId, parentId);
+            query.eq(LawsTreeNode::getModuleCode, lawsTreeNode.getModuleCode());
+            query.eq(LawsTreeNode::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+            query.ne(LawsTreeNode::getId,lawsTreeNode.getId());
+            List<LawsTreeNode> lawsTreeNodes = this.list(query);
+            if (lawsTreeNodes != null && !lawsTreeNodes.isEmpty()) {
+                //TODO 翻译
+                throw new JeroBootException("已存在名为" + lawsTreeNode.getNodeName() + "的节点");
+            }
             this.updateById(lawsTreeNode);
             return true;
         } else {