From 8ca64d03d58db959d95f49119be0cb322d6edf2f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Jul 2021 17:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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 4cf8335..bb8eaf4 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
@@ -199,4 +199,29 @@
public List<String> selectIn() {
return baseMapper.selectIn();
}
+
+ /**
+ * 懒加载获取部门树形结构(包含用户数据)
+ * @return
+ */
+ @Override
+ public List<DeptVO> lazyTreeUser(String tenantId, Long parentId) {
+ if (AuthUtil.isAdministrator()) {
+ tenantId = StringPool.EMPTY;
+ }
+ return ForestNodeMerger.merge(baseMapper.lazyTreeUser(tenantId, parentId));
+ }
+
+ @Override
+ public Long add(Dept dept) {
+ return baseMapper.add(dept);
+ }
+
+ /**
+ * 懒加载获取部门树形结构(按分类查询)
+ */
+ @Override
+ public List<DeptVO> lazyTreeType(String deptCategory, Long parentId) {
+ return ForestNodeMerger.merge(baseMapper.lazyTreeType("000000",deptCategory,parentId));
+ }
}
--
Gitblit v1.9.3