From 3524bd78770d3dd16b8be3e4fa9cba06a42cefa0 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 25 Jan 2024 14:52:25 +0800
Subject: [PATCH] 住户监管柱状图
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 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 c315513..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,21 +99,18 @@
@Override
public List<DeptVO> tree(String tenantId) {
- Long parentId = 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;
-// }
-
- return ForestNodeMerger.merge(baseMapper.tree(tenantId, parentId));
+ 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);
}
@Override
@@ -353,8 +350,8 @@
List<DeptVO> deptVOS = baseMapper.getGridDeptAndParentList();
//遍历处理
for (DeptVO deptVO : deptVOS) {
- GridEntity gridEntity = SpringUtils.getBean(IGridService.class).getGridByNames(deptVO.getDeptName(),deptVO.getParentName());
- if (null!=gridEntity){
+ GridEntity gridEntity = SpringUtils.getBean(IGridService.class).getGridByNames(deptVO.getDeptName(), deptVO.getParentName());
+ if (null != gridEntity) {
deptVO.setRegionCode(gridEntity.getGridCode());
// 更新
updateById(deptVO);
--
Gitblit v1.9.3