From 0216e745dc57d021c0fa81115811b74abd815f36 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 24 二月 2025 20:47:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
start/src/main/java/com/ycl/web/controller/system/SysDeptController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java b/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java
index 66159d4..6ba80ff 100644
--- a/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java
+++ b/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java
@@ -1,6 +1,7 @@
package com.ycl.web.controller.system;
import java.util.List;
+import java.util.Objects;
import com.ycl.common.base.Result;
import com.ycl.common.core.domain.StringTreeSelect;
@@ -113,7 +114,7 @@
{
return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
}
- else if (dept.getParentId().equals(deptId))
+ else if (Objects.nonNull(dept.getParentId()) && dept.getParentId().equals(deptId))
{
return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁");
}
--
Gitblit v1.8.0