From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java | 21 +++++++++++++++++++++
1 files changed, 21 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 3758114..db0fd4e 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
@@ -20,6 +20,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.annotation.ApiLog;
@@ -131,6 +132,17 @@
}
/**
+ * 获取处警员树形结构
+ */
+ @GetMapping("/Batrees")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "树形结构", notes = "树形结构")
+ public R<List<DeptVO>> Batrees(String tenantId, BladeUser bladeUser) {
+ List<DeptVO> tree = deptService.Batrees();
+ return R.data(tree);
+ }
+
+ /**
* 懒加载获取部门树形结构
*/
@GetMapping("/lazy-tree")
@@ -186,4 +198,13 @@
public R selectInfo() {
return R.data(deptService.selectInfo());
}
+
+ /**
+ * 查询所有的部门信息
+ * @return
+ */
+ @GetMapping("/selDeptList")
+ public List<DeptVo> selDeptList() {
+ return deptService.selDeptList();
+ }
}
--
Gitblit v1.9.3