From 53675c635822794dbd79f0d0197c955af29c688f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 21 Jul 2021 10:46:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management

---
 src/main/java/org/springblade/modules/system/controller/DeptController.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/DeptController.java b/src/main/java/org/springblade/modules/system/controller/DeptController.java
index 0e3dbca..ba91200 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -126,6 +126,9 @@
 		return R.data(tree);
 	}
 
+
+
+
 	/**
 	 * 懒加载获取部门树形结构
 	 */
@@ -137,6 +140,16 @@
 	}
 
 	/**
+	 * 懒加载获取部门树形结构(包含用户数据)
+	 * @return
+	 */
+	@GetMapping("/lazy-tree-user")
+	public R<List<DeptVO>> lazyTreeUser(String tenantId, Long parentId, BladeUser bladeUser) {
+		List<DeptVO> tree = deptService.lazyTreeUser(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+		return R.data(tree);
+	}
+
+	/**
 	 * 新增或修改
 	 */
 	@PostMapping("/submit")

--
Gitblit v1.9.3