From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 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 bbcb7e6..56a16d3 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -17,7 +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;
@@ -46,7 +49,7 @@
* @param tenantId
* @return
*/
- List<DeptVO> tree(String tenantId);
+ List<DeptVO> tree(String tenantId, Long id);
/**
* 懒加载获取树形节点
@@ -65,4 +68,54 @@
*/
List<String> getDeptNames(Long[] ids);
+ /**
+ * 查询当前机构信息
+ *
+ * @param id
+ * @return
+ */
+ 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> getDeptMapAndChildren(@Param("treeNode")DeptUserTreeNode treeNode);
+
+ /**
+ * 查询用户树
+ * @param treeNode
+ * @return
+ */
+ @MapKey(value = "id")
+ Map<String, DeptUserTreeNode> getUserMap(@Param("treeNode") DeptUserTreeNode treeNode);
+
+ /**
+ * 查询网格对应的机构信息（包含父级机构名称）
+ *
+ * @return
+ */
+ List<DeptVO> getGridDeptAndParentList();
+
+ /**
+ * 查询对应的派出所
+ * @param deptId
+ * @return
+ */
+ Dept getDeptByDeptIds(@Param("deptId") String deptId);
+ @MapKey(value = "id")
+ Map<String, DeptUserTreeNode> getDeptMapAndChild(@Param("treeNode")DeptUserTreeNode treeNode);
+ @MapKey(value = "id")
+ Map<String, DeptUserTreeNode> getUserMapByDeptIds(@Param("deptIds") String deptIds);
}
--
Gitblit v1.9.3