From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 00d489d..edd2a4d 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
@@ -52,6 +52,8 @@
 	 */
 	List<DeptVO> tree(String tenantId);
 
+	List<DeptVO> treeByParentId(List<String> parentIds);
+
 	/**
 	 * 懒加载获取树形节点
 	 *
@@ -59,7 +61,7 @@
 	 * @param parentId
 	 * @return
 	 */
-	List<DeptVO> lazyTree(String tenantId, Long parentId);
+	List<DeptVO> lazyTree(String tenantId, List<Long> parentId);
 
 	/**
 	 * 获取部门名
@@ -92,4 +94,6 @@
 	 */
 	@MapKey(value = "id")
 	Map<String, DeptUserTreeNode> getUserMap(@Param("treeNode") DeptUserTreeNode treeNode);
+
+    String getResDept(@Param("deptIds") String deptIds);
 }

--
Gitblit v1.9.3