From 5cceb01ea15fa807ebe0011c5b38780cb3e3e2c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Nov 2021 23:50:26 +0800
Subject: [PATCH] 部门数菜单修改，考试审核修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.java | 24 ++++++++++++++++++++++--
1 files changed, 22 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 e1255a1..81ca99f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -24,6 +24,7 @@
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.node.TreeNodes;
import org.springblade.modules.system.vo.DeptVO;
+import org.springblade.modules.system.vo.UserVO;
import java.util.List;
import java.util.Map;
@@ -58,9 +59,10 @@
*
* @param tenantId
* @param parentId
+ * @param type 不为空时查公安局
* @return
*/
- List<DeptVO> lazyTree(String tenantId, Long parentId);
+ List<DeptVO> lazyTree(String tenantId, Long parentId,Integer type);
/**
* 懒加载获取树形节点
@@ -89,8 +91,9 @@
/**
* 懒加载获取部门树形结构,不包含顶级管理员公安局
*/
- List<DeptVO> securityLazyTree(String jurisdiction, Long parentId);
+ List<DeptVO> securityLazyTree(@Param("jurisdiction") String jurisdiction, Long parentId);
List<DeptVO> selectInfo();
+
/**
* 查询所有的部门信息
* @return
@@ -151,4 +154,21 @@
*/
List<DeptVO> lazyTreeJurisdiction(@Param("jurisdiction")String jurisdiction,
@Param("deptId")Long parentId);
+
+ List<DeptVO> lazyTreeCity(String tenantId, Long parentId);
+
+ List<DeptVO> lazyTreeCityOne(String tenantId, Long parentId);
+
+ /**
+ * 查询用户信息
+ * @param userId
+ * @return
+ */
+ UserVO getUserInfoById(String userId);
+
+ /**
+ * 查所有公安局数据
+ * @return
+ */
+ List<DeptVO> lazyTreeByJurisdiction();
}
--
Gitblit v1.9.3