From c2c9e3b1039c0a5223801759475112c6da9a3a3d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 二月 2025 14:59:49 +0800
Subject: [PATCH] 项目相关联系人调整
---
start/src/main/java/com/ycl/web/controller/system/SysDeptController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..3b16f3a 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() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁");
}
@@ -150,6 +151,6 @@
public Result approvalList() {
SysDept dept = new SysDept();
dept.setParentId(approvalPortId);
- return deptService.all(dept);
+ return Result.ok().data(deptService.selectDeptListNoAuth(dept));
}
}
--
Gitblit v1.8.0