From 0b1e9e70818f0e3eb32dd6c029d42d93236ecdc6 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Wed, 03 Jul 2024 12:07:01 +0800
Subject: [PATCH] 数据同步新增连接池配置

---
 src/main/java/org/springblade/modules/system/mapper/DeptMapper.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 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 7844f1b..c52324e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -17,8 +17,10 @@
 package org.springblade.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.node.DeptUserTreeNode;
 import org.springblade.modules.system.vo.DeptVO;
 
 import java.util.List;
@@ -47,7 +49,7 @@
 	 * @param tenantId
 	 * @return
 	 */
-	List<DeptVO> tree(String tenantId, Long parentId, Long id);
+	List<DeptVO> tree(String tenantId, Long id);
 
 	/**
 	 * 懒加载获取树形节点
@@ -72,7 +74,23 @@
 	 * @param id
 	 * @return
 	 */
-	DeptVO getDeptById(@Param("id") Long id);
+    DeptVO getDeptById(@Param("id") Long id);
+
+	/**
+	 * 查询组织机构树
+	 * @param treeNode
+	 * @return
+	 */
+	@MapKey(value = "id")
+	Map<String, DeptUserTreeNode> getDeptMap(@Param("treeNode") DeptUserTreeNode treeNode);
+
+	/**
+	 * 查询用户树
+	 * @param treeNode
+	 * @return
+	 */
+	@MapKey(value = "id")
+	Map<String, DeptUserTreeNode> getUserMap(@Param("treeNode") DeptUserTreeNode treeNode);
 
 	/**
 	 * 查询网格对应的机构信息(包含父级机构名称)
@@ -80,4 +98,11 @@
 	 * @return
 	 */
 	List<DeptVO> getGridDeptAndParentList();
+
+	/**
+	 * 查询对应的派出所
+	 * @param deptId
+	 * @return
+	 */
+    Dept getDeptByDeptIds(@Param("deptId") String deptId);
 }

--
Gitblit v1.9.3