From 4dd54344d990773acd4e5f3c53dc21e8f82acba6 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 28 Jul 2021 15:33:17 +0800
Subject: [PATCH] 保安列表修改
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 20e0850..8cbc014 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -124,6 +124,17 @@
return R.data(tree);
}
+
+ /**
+ * 懒加载获取部门树形结构(包含用户数据)
+ * @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);
+ }
+
/**
* 懒加载获取部门树形结构,不包含顶级管理员公安局
*/
@@ -131,6 +142,16 @@
@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
public R<List<DeptVO>> securityLazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
List<DeptVO> tree = deptService.securityLazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+ return R.data(tree);
+ }
+
+ /**
+ * 懒加载获取部门树形结构(按分类查询)
+ */
+ @GetMapping("/lazy-tree-type")
+ @ApiOperation(value = "懒加载树形结构", notes = "树形结构")
+ public R<List<DeptVO>> LazyTreeType(String deptCategory, Long parentId) {
+ List<DeptVO> tree = deptService.lazyTreeType(deptCategory, parentId);
return R.data(tree);
}
@@ -172,5 +193,8 @@
return R.status(deptService.removeDept(ids));
}
-
+ @GetMapping("/selectIn")
+ public R selectIn() {
+ return R.data(deptService.selectIn());
+ }
}
--
Gitblit v1.9.3