From 76b3cbcaf65e949b1d5f19e3c0624bc6528e34d3 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 24 Jan 2024 17:27:07 +0800
Subject: [PATCH] 区域查询过滤调整
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..8862eeb 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,7 +99,7 @@
@Override
public List<DeptVO> tree(String tenantId) {
- Long parentId = null;
+ Long id = null;
// 判断数据权限控制,非超管角色只可看到本级及以下数据
// if (!AuthUtil.isAdministrator()) {
// Long deptId = Func.firstLong(AuthUtil.getDeptId());
@@ -112,8 +112,14 @@
// 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")) {
+ // 获取当前用户的机构
+ id = Func.firstLong(AuthUtil.getDeptId());
+ }
- return ForestNodeMerger.merge(baseMapper.tree(tenantId, parentId));
+ return ForestNodeMerger.merge(baseMapper.tree(tenantId, id));
}
@Override
@@ -353,8 +359,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