From 6915414d07fdec8b92a0fc5cf30b48d501a4ddac Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Jul 2021 17:29:45 +0800
Subject: [PATCH] 代码合并
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index ffa2c45..5e5641b 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -184,4 +184,14 @@
return baseMapper.selectHold(deptid);
}
+ /**
+ * 懒加载获取部门树形结构,不包含顶级管理员公安局
+ */
+ @Override
+ public List<DeptVO> securityLazyTree(String tenantId, Long parentId) {
+ if (AuthUtil.isAdministrator()) {
+ tenantId = StringPool.EMPTY;
+ }
+ return ForestNodeMerger.merge(baseMapper.securityLazyTree(tenantId, parentId));
+ }
}
--
Gitblit v1.9.3