From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/system/controller/DeptController.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 c9347a2..ed79202 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -25,6 +25,7 @@
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tenant.annotation.NonDS;
@@ -145,8 +146,8 @@
 	 * @return
 	 */
 	@GetMapping("/lazy-tree-users")
-	public R<List<TreeNodes>> lazyTreeUsers(String tenantId, Long parentId, BladeUser bladeUser) {
-		List<TreeNodes> tree = deptService.lazyTreeUsers(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+	public R<List<TreeNodes>> lazyTreeUsers(Integer type,Long deptId) {
+		List<TreeNodes> tree = deptService.lazyTreeUsers(type,deptId);
 		return R.data(tree);
 	}
 
@@ -228,8 +229,16 @@
 		return R.status(deptService.removeDept(ids));
 	}
 
+	@ApiLog("Blog详情")
+	@GetMapping("/selectInfo")
+	public R<List<DeptVO>> selectInfo() {
+		List<DeptVO> tree =deptService.selectInfo();
+		return R.data(tree);
+	}
+
 	@GetMapping("/selectIn")
 	public R selectIn() {
 		return R.data(deptService.selectIn());
 	}
+
 }

--
Gitblit v1.9.3