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/DeptServiceImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 4d4d7ab..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,6 +88,9 @@
 
 	@Override
 	public List<DeptVO> treeByParentId(String parentId) {
+		if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) {
+			return ForestNodeMerger.merge(baseMapper.tree(StringPool.EMPTY));
+		}
 		return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId));
 	}
 

--
Gitblit v1.9.3