From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
index 8af5cde..b7ff1e4 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
@@ -118,6 +118,19 @@
 	}
 
 	/**
+	 * 获取部门树形结构
+	 *
+	 * @return
+	 */
+	@GetMapping("/trees")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "树形结构", notes = "树形结构")
+	public R<List<DeptVO>> trees(String tenantId, BladeUser bladeUser) {
+		List<DeptVO> tree = deptService.trees();
+		return R.data(tree);
+	}
+
+	/**
 	 * 懒加载获取部门树形结构
 	 */
 	@GetMapping("/lazy-tree")

--
Gitblit v1.9.3