From 8d637e54a1104e8e47093aef2fb2006e7f6533c6 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 05 Jun 2023 21:26:19 +0800
Subject: [PATCH] 增加新菜单配置
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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..8b4896f 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,10 +81,10 @@
@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));
+ return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId.split(",")));
}
@Override
--
Gitblit v1.9.3