From aabce4b306d3fb996a64ad41d40bc5629512d2fa Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 20 Apr 2024 10:01:01 +0800
Subject: [PATCH] 议事问题优化
---
src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 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 bdacb04..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;
}
--
Gitblit v1.9.3