From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 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 8fcaa17..02e6919 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
@@ -181,4 +181,19 @@
return baseMapper.selDeptList();
}
+ @Override
+ public List<DeptVo> selXQList() {
+ return baseMapper.selXQList();
+ }
+
+ /**
+ * 懒加载获取部门树形结构--关联组织机构（包含保安员信息）
+ */
+ @Override
+ public List<DeptVO> lazyTreeSecurity(String tenantId, Long parentId) {
+ if (AuthUtil.isAdministrator()) {
+ tenantId = StringPool.EMPTY;
+ }
+ return ForestNodeMerger.merge(baseMapper.lazyTreeSecurity(tenantId, parentId));
+ }
}
--
Gitblit v1.9.3