From 3b1bba4cae03694d1364115b9cd539bee066ce7e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 10 Sep 2021 15:50:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 28154fd..5350a6d 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;
@@ -228,8 +229,11 @@
return R.status(deptService.removeDept(ids));
}
- @GetMapping("/selectIn")
- public R selectIn() {
- return R.data(deptService.selectIn());
+ @ApiLog("Blog详情")
+ @GetMapping("/selectInfo")
+ public R<List<DeptVO>> selectInfo() {
+ List<DeptVO> tree =deptService.selectInfo();
+ return R.data(tree);
}
+
}
--
Gitblit v1.9.3