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/service/IDeptService.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IDeptService.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IDeptService.java
index c2c1312..6df1251 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IDeptService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IDeptService.java
@@ -16,6 +16,8 @@
  */
 package cn.gistack.system.service;
 
+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.extension.service.IService;
@@ -47,6 +49,7 @@
 	 * @return
 	 */
 	List<DeptVO> tree(String tenantId);
+	List<DeptVO> treeByParentId(String parentId);
 
 	/**
 	 * 懒加载树形结构
@@ -55,7 +58,7 @@
 	 * @param parentId
 	 * @return
 	 */
-	List<DeptVO> lazyTree(String tenantId, Long parentId);
+	List<DeptVO> lazyTree(String tenantId, String parentIds);
 
 	/**
 	 * 获取部门ID
@@ -116,4 +119,21 @@
 	 */
 	List<DeptVO> search(String deptName, Long parentId);
 
+	/**
+	 * 查询组织机构树数据（下级包含人员信息）
+	 * @param treeNode
+	 * @return
+	 */
+	List<TreeNode> getDeptAndUserTree(DeptUserTreeNode treeNode);
+
+	int updateAllDept();
+
+	boolean updateDeptByTb(String adCode, String resGuid);
+
+	/**
+	 * 根据机构ids获取水库编码
+	 * @param deptIds
+	 * @return
+	 */
+	String getResDept(String deptIds);
 }

--
Gitblit v1.9.3