From 467e707746195bda78bed471322b739192f8d37d Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 22 Jun 2019 21:57:50 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=20=E8=A7=92=E8=89=B2=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/system/service/impl/RoleServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java index b7bda475..20ae2106 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java @@ -60,7 +60,7 @@ public class RoleServiceImpl extends ServiceImpl implements IR public List tree(String tenantId) { String userRole = SecureUtil.getUserRole(); String excludeRole = null; - if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR) && !CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR)) { + if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMIN) && !CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR)) { excludeRole = RoleConstant.ADMINISTRATOR; } return ForestNodeMerger.merge(baseMapper.tree(tenantId, excludeRole));