From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 96b432a..e2bfb44 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
@@ -270,14 +270,14 @@
Dept dept = new Dept();
dept.setDeptName(jurisdiction.getDeptName());
Dept dept1 = this.getOne(Condition.getQueryWrapper(dept));
- map = baseMapper.lazyTreeUsersPublicSecurity(type, dept1.getId(), one.getJurisdiction());
+ map = baseMapper.lazyTreeUsersPublicSecurity(null, dept1.getId(), one.getJurisdiction());
}
}
}
//民警向民警汇报，需要南昌市及当前民警所在辖区的部门数据
if(type==3){
//当前取所有的民警数据
- map = baseMapper.lazyTreeUsersPublicSecuritys(type,null,null);
+ map = baseMapper.lazyTreeUsersPublicSecuritys(null,deptId,null);
}
List<TreeNodes> tree = new ArrayList<>();
Map<Long, TreeNodes> finalMap = map;
@@ -300,4 +300,13 @@
public List<DeptVo> selDeptList() {
return baseMapper.selDeptList();
}
+
+
+ /**
+ * 懒加载获取部门树形结构,根据辖区查询
+ */
+ @Override
+ public List<DeptVO> lazyTreeJurisdiction(String jurisdiction, Long parentId) {
+ return ForestNodeMerger.merge(baseMapper.lazyTreeJurisdiction(jurisdiction,parentId));
+ }
}
--
Gitblit v1.9.3