From bdeb1fbd8a7933b8425bbed2b0093dfa1c2b4d3e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 15 May 2023 19:23:24 +0800
Subject: [PATCH] 菜单,角色查询调整排序

---
 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.java
index 739575b..9fea3ae 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.java
@@ -16,9 +16,13 @@
  */
 package cn.gistack.system.mapper;
 
+import cn.gistack.common.node.DeptUserTreeNode;
+import cn.gistack.common.node.TreeNode;
 import cn.gistack.system.entity.Dept;
 import cn.gistack.system.vo.DeptVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -48,6 +52,8 @@
 	 */
 	List<DeptVO> tree(String tenantId);
 
+	List<DeptVO> treeByParentId(String parentId);
+
 	/**
 	 * 懒加载获取树形节点
 	 *
@@ -65,4 +71,27 @@
 	 */
 	List<String> getDeptNames(Long[] ids);
 
+	/**
+	 * 查询组织机构树数据(下级包含人员信息)
+	 * @param treeNode
+	 * @return
+	 */
+	@MapKey(value = "id")
+    Map<String, DeptUserTreeNode> getDeptAndUserTree(@Param("treeNode") DeptUserTreeNode treeNode);
+
+	/**
+	 * 查询组织机构树
+	 * @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);
 }

--
Gitblit v1.9.3