From 3432fad3ebcecd73d3d50fa8dfb7934cc61cfd06 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 15:04:16 +0800
Subject: [PATCH] 保安员查询新增审查排序
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 c019588..adf630d 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
@@ -168,6 +168,16 @@
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() {
@@ -180,7 +190,7 @@
}
@Override
- public Map<Object, Integer> selectHold(String deptid) {
+ public Map<Object, Object> selectHold(String deptid) {
return baseMapper.selectHold(deptid);
}
@@ -189,4 +199,16 @@
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