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/mapper/DeptMapper.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
index 6dc5a5d..e1255a1 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
+import org.springblade.common.vo.DeptVo;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.node.TreeNodes;
import org.springblade.modules.system.vo.DeptVO;
@@ -89,7 +90,12 @@
* 懒加载获取部门树形结构,不包含顶级管理员公安局
*/
List<DeptVO> securityLazyTree(String jurisdiction, Long parentId);
-
+ List<DeptVO> selectInfo();
+ /**
+ * 查询所有的部门信息
+ * @return
+ */
+ List<DeptVo> selDeptList();
/**
* 懒加载获取部门树形结构(包含用户数据)
* @return
@@ -117,5 +123,32 @@
*/
@MapKey(value = "id")
@SqlParser(filter=true)
- Map<Long, TreeNodes> lazyTreeUsers(@Param("parentId") Long parentId);
+ Map<Long, TreeNodes> lazyTreeUsers(@Param("type") Integer type,
+ @Param("deptId") Long deptId,
+ @Param("jurisdiction")String jurisdiction);
+
+ /**
+ * 懒加载获取部门树形结构(包含用户数据),只查下一级的数据
+ * @return
+ */
+ @MapKey(value = "id")
+ @SqlParser(filter=true)
+ Map<Long, TreeNodes> lazyTreeUsersPublicSecurity(@Param("type") Integer type,
+ @Param("deptId") Long deptId,
+ @Param("jurisdiction")String jurisdiction);
+ /**
+ * 懒加载获取部门树形结构(包含用户数据),只查下一级的数据 民警向民警汇报
+ * @return
+ */
+ @MapKey(value = "id")
+ @SqlParser(filter=true)
+ Map<Long, TreeNodes> lazyTreeUsersPublicSecuritys(@Param("type") Integer type,
+ @Param("deptId") Long deptId,
+ @Param("jurisdiction")String jurisdiction);
+
+ /**
+ * 懒加载获取部门树形结构,根据辖区查询
+ */
+ List<DeptVO> lazyTreeJurisdiction(@Param("jurisdiction")String jurisdiction,
+ @Param("deptId")Long parentId);
}
--
Gitblit v1.9.3