|
|
@@ -59,7 +59,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
|
|
|
public List<RoleVO> tree(String tenantCode) {
|
|
|
String userRole = SecureUtil.getUserRole();
|
|
|
String excludeRole = null;
|
|
|
- if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMIN)) {
|
|
|
+ if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMIN) && !CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR)) {
|
|
|
excludeRole = RoleConstant.ADMIN;
|
|
|
}
|
|
|
return ForestNodeMerger.merge(baseMapper.tree(tenantCode, excludeRole));
|