From 8e6f6217e52a635d1dfd4ccbb549b0427d3f9fa6 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 27 Apr 2022 15:55:17 +0800
Subject: [PATCH] 新增保安员新增审查
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 4f1cad3..c268db4 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
@@ -186,11 +186,15 @@
* 懒加载获取部门树形结构,不包含顶级管理员公安局
*/
@Override
- public List<DeptVO> securityLazyTree(String tenantId, Long parentId) {
- if (AuthUtil.isAdministrator()) {
- tenantId = StringPool.EMPTY;
+ public List<DeptVO> securityLazyTree(String jurisdiction, Long parentId,Long deptId) {
+ //如果传了deptId
+ if (null!=deptId){
+ //递归查询
+// recursionDeptInfo(deptVOS, list);
+ //tree 组装并返回
+ return ForestNodeMerger.merge(baseMapper.securityDeptUnitList(null,deptId));
}
- return ForestNodeMerger.merge(baseMapper.securityLazyTree(tenantId, parentId));
+ return ForestNodeMerger.merge(baseMapper.securityLazyTree(jurisdiction, parentId));
}
@Override
@@ -204,7 +208,7 @@
}
@Override
- public Map<Object, Object> selectHold(String deptid) {
+ public List<Map<String, Object>> selectHold(String deptid) {
return baseMapper.selectHold(deptid);
}
--
Gitblit v1.9.3