From a8d11819563fcd3d237f354574ccadb92ccf57e4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 May 2023 20:15:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 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