From 86dff1d678838a157c1cf67cdd9381e40d7af96e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 13 Jun 2023 11:45:38 +0800
Subject: [PATCH] app多角色菜单权限合并
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java
index 32fb6fd..bc9e1c9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java
@@ -88,7 +88,7 @@
@Override
public List<DeptVO> treeByParentId(String parentId) {
- if (AuthUtil.isAdministrator()) {
+ if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) {
return ForestNodeMerger.merge(baseMapper.tree(StringPool.EMPTY));
}
return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId));
--
Gitblit v1.9.3