From c0e32b4907e8ac9cae56b77e4f83fefdc8cc5ad3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 24 Jan 2024 17:27:40 +0800
Subject: [PATCH] 机构查询优化
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 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 8862eeb..c049953 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,27 +99,18 @@
@Override
public List<DeptVO> tree(String tenantId) {
- Long id = null;
+ Long id = 0L;
// 判断数据权限控制,非超管角色只可看到本级及以下数据
-// if (!AuthUtil.isAdministrator()) {
-// Long deptId = Func.firstLong(AuthUtil.getDeptId());
-// Dept dept = SysCache.getDept(deptId);
-// if (dept.getParentId() != 0) {
-// parentId = dept.getParentId();
-// }
-// List<DeptVO> merge = ForestNodeMerger.merge(baseMapper.tree(tenantId, parentId));
-// List<DeptVO> copy = BeanUtil.copy(merge, DeptVO.class);
-// copy = copy.stream().filter(item -> AuthUtil.getDeptId().contains(item.getId().toString())).collect(Collectors.toList());
-// return copy;
-// }
- String userRole = AuthUtil.getUserRole();
- // 判断物业公司
- if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
- // 获取当前用户的机构
+ if (!AuthUtil.isAdmin()) {
id = Func.firstLong(AuthUtil.getDeptId());
}
-
- return ForestNodeMerger.merge(baseMapper.tree(tenantId, id));
+ List<DeptVO> tree = baseMapper.tree(tenantId, id);
+ if (AuthUtil.isAdmin()) {
+ for (DeptVO deptVO : tree) {
+ deptVO.setDisabled(false);
+ }
+ }
+ return ForestNodeMerger.merge(tree);
}
@Override
--
Gitblit v1.9.3