From fe3996e9c4f4236d39f8ef468586c31a8a532d55 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sun, 23 Apr 2023 11:57:37 +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 |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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..8a04daf 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;
@@ -116,4 +118,10 @@
 	 */
 	List<DeptVO> search(String deptName, Long parentId);
 
+	/**
+	 * 查询组织机构树数据（下级包含人员信息）
+	 * @param treeNode
+	 * @return
+	 */
+	List<TreeNode> getDeptAndUserTree(DeptUserTreeNode treeNode);
 }

--
Gitblit v1.9.3