From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并，网格员区域树查询修改，解决不显示网格问题
---
src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java
index 8070d36..ebcbae0 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java
@@ -80,7 +80,7 @@
}
List<RoleVO> merge = ForestNodeMerger.merge(baseMapper.tree(tenantId, excludeRole));
List<RoleVO> copy = BeanUtil.copy(merge, RoleVO.class);
- if (!AuthUtil.isAdministrator()) {
+ if (!AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
List<RoleVO> collect = copy.stream().filter(item -> roleId.contains(item.getId().toString())).collect(Collectors.toList());
return collect;
}
@@ -118,7 +118,7 @@
// 新增配置
roleMenuService.saveBatch(roleMenus);
// 递归设置下属角色菜单集合
- recursionRoleMenu(roleIds, menuIds);
+// recursionRoleMenu(roleIds, menuIds);
return true;
}
--
Gitblit v1.9.3