From 6224d1c19b5d92a2e5dd31eaa36d70fdfb0f5243 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 19 Jul 2021 11:55:53 +0800
Subject: [PATCH] 1.新增保安员列表接口 2.行政区tree 接口修改
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 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 294118f..4c82775 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
@@ -90,6 +90,11 @@
}
@Override
+ public List<DeptVO> lazyTrees() {
+ return ForestNodeMerger.merge(baseMapper.lazyTrees());
+ }
+
+ @Override
public String getDeptIds(String tenantId, String deptNames) {
List<Dept> deptList = baseMapper.selectList(Wrappers.<Dept>query().lambda().eq(Dept::getTenantId, tenantId).in(Dept::getDeptName, Func.toStrList(deptNames)));
if (deptList != null && deptList.size() > 0) {
@@ -163,5 +168,47 @@
List<Dept> deptList = baseMapper.selectList(queryWrapper);
return DeptWrapper.build().listNodeVO(deptList);
}
+ /**
+ * 懒加载获取部门树形结构,不包含顶级管理员公安局
+ */
+ @Override
+ public List<DeptVO> securityLazyTree(String tenantId, Long parentId) {
+ if (AuthUtil.isAdministrator()) {
+ tenantId = StringPool.EMPTY;
+ }
+ return ForestNodeMerger.merge(baseMapper.securityLazyTree(tenantId, parentId));
+ }
+
+ @Override
+ public List<Map<Object,String>> selectCount() {
+ return baseMapper.selectCount();
+ }
+
+ @Override
+ public List<Map<Object, String>> selectId(String id) {
+ return baseMapper.selectId(id);
+ }
+
+ @Override
+ public Map<Object, Integer> selectHold(String deptid) {
+ return baseMapper.selectHold(deptid);
+ }
+
+ @Override
+ 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));
+ }
}
--
Gitblit v1.9.3