From 396bf585bc43c16c944fdc03e9e5efc5a8432aad Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 23 Apr 2023 11:46:27 +0800
Subject: [PATCH] 新增组织机构人员树查询接口

---
 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java
index fd8aab6..50a79de 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java
@@ -16,6 +16,9 @@
  */
 package cn.gistack.system.controller;
 
+import cn.gistack.common.node.DeptUserTreeNode;
+import cn.gistack.common.node.TreeNode;
+import cn.gistack.common.utils.NodeTreeUtil;
 import cn.gistack.system.vo.DeptVO;
 import cn.gistack.system.wrapper.DeptWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -176,4 +179,16 @@
 	}
 
 
+	/**
+	 * 查询组织机构树数据(下级包含人员信息)
+	 * @param treeNode
+	 * @return
+	 */
+	@GetMapping("/getDeptAndUserTree")
+	@ApiOperation(value = "查询组织机构树数据(下级包含人员信息)")
+	public R getDeptAndUserTree(DeptUserTreeNode treeNode) {
+		return R.data(deptService.getDeptAndUserTree(treeNode));
+	}
+
+
 }

--
Gitblit v1.9.3