From de76e1a8fc2576ecd1177074f5805577205e1006 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 26 Jan 2024 15:39:15 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index c049953..379fdf6 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -99,17 +99,12 @@
@Override
public List<DeptVO> tree(String tenantId) {
- Long id = 0L;
+ Long id = null;
// 判断数据权限控制,非超管角色只可看到本级及以下数据
if (!AuthUtil.isAdmin()) {
id = Func.firstLong(AuthUtil.getDeptId());
}
List<DeptVO> tree = baseMapper.tree(tenantId, id);
- if (AuthUtil.isAdmin()) {
- for (DeptVO deptVO : tree) {
- deptVO.setDisabled(false);
- }
- }
return ForestNodeMerger.merge(tree);
}
@@ -126,7 +121,7 @@
// parentId = dept.getParentId();
// }
// }
- if (Func.toLong(parentId) == 0L && !AuthUtil.isAdministrator()) {
+ if (Func.toLong(parentId) == 0L && !AuthUtil.isAdmin()) {
Long deptId = Func.firstLong(AuthUtil.getDeptId());
Dept dept = SysCache.getDept(deptId);
if (dept.getParentId() != 0) {
--
Gitblit v1.9.3