From c4366744459ea1e43205b1a6f50a646bc9a933d6 Mon Sep 17 00:00:00 2001
From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com>
Date: Fri, 20 Sep 2024 09:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E9=A1=B6?=
 =?UTF-8?q?=E7=BA=A7=E5=85=AC=E5=8F=B8=20=E4=B8=8D=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E5=94=AF=E4=B8=80=E6=80=A7?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/system/service/impl/SysDeptServiceImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
index 63a18aa..03b8e4d 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
@@ -184,7 +184,10 @@ public class SysDeptServiceImpl implements ISysDeptService
     public boolean checkDeptNameUnique(SysDept dept)
     {
         Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
-        SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
+        //如果没有parentid则认为是根节点，检查根节点是否重名，added by weiweiwang 2024/9/20
+        Long parentId = StringUtils.isNull(dept.getParentId()) ? 0L : dept.getParentId();
+
+        SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), parentId);
         if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
         {
             return UserConstants.NOT_UNIQUE;