From 2423ac966273e5b7530b140cc6ed28d36e42d4d3 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 22 Apr 2024 10:17:05 +0800
Subject: [PATCH] sso 初次提交
---
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