From 69155f0115473d6c17bb7441bc1c7b06e05173ef Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 27 八月 2024 10:45:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
index a582612..6791398 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
@@ -387,9 +387,13 @@
* @return names鍒楄〃
*/
public List<String> getAncestorsNames(long deptId, List<String> names) {
- SysDept dept = this.getById(deptId);
+ SysDept dept = deptMapper.selectDeptById(deptId);
if (dept == null) {
- return new ArrayList<>();
+ return names;
+ }
+ if (deptId == 100) {
+ names.add(dept.getDeptName());
+ return names;
}
if (dept.getParentId() != null && dept.getParentId() == 100) {
names.add(dept.getDeptName());
--
Gitblit v1.9.1