From bdeb1fbd8a7933b8425bbed2b0093dfa1c2b4d3e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 15 May 2023 19:23:24 +0800
Subject: [PATCH] 菜单，角色查询调整排序
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
index 1bc73ac..a0e43a6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
@@ -81,8 +81,8 @@
@Override
public List<RoleVO> treeByParentId(String parentId) {
- if (AuthUtil.isAdministrator()) {
- return ForestNodeMerger.merge(baseMapper.tree(StringPool.EMPTY, RoleConstant.ADMINISTRATOR));
+ if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) {
+ return ForestNodeMerger.merge(baseMapper.tree(null, RoleConstant.ADMINISTRATOR));
}
return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId));
}
--
Gitblit v1.9.3