From ae38b2b65b709ac576eec2b507c92008a7afc3de Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 27 Apr 2021 09:26:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
index 7acb758..e68a7c7 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.constant.BladeConstant;
@@ -82,11 +83,28 @@
}
@Override
+ public List<DeptVO> trees() {
+ return ForestNodeMerger.merge(baseMapper.trees());
+ }
+
+ @Override
+ public List<DeptVO> Batrees() {
+ return ForestNodeMerger.merge(baseMapper.Batrees());
+ }
+
+ @Override
public List<DeptVO> lazyTree(String tenantId, Long parentId) {
if (AuthUtil.isAdministrator()) {
tenantId = StringPool.EMPTY;
}
return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));
+ }
+ @Override
+ public List<DeptVO> lazyTrees(String tenantId, Long parentId) {
+ if (AuthUtil.isAdministrator()) {
+ tenantId = StringPool.EMPTY;
+ }
+ return ForestNodeMerger.merge(baseMapper.lazyTrees(tenantId, parentId));
}
@Override
@@ -142,4 +160,12 @@
return baseMapper.selectInfo();
}
+ /**
+ * 查询所有的部门信息
+ * @return
+ */
+ @Override
+ public List<DeptVo> selDeptList() {
+ return baseMapper.selDeptList();
+ }
}
--
Gitblit v1.9.3