From bc1f282f1cc9bdad3225ec8d1acea44d7835aba6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 15 Nov 2021 14:00:49 +0800
Subject: [PATCH] 1.分公司权限
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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..bafd574 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;
@@ -124,8 +125,19 @@
@GetMapping("/lazy-tree")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
- public R<List<DeptVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
- List<DeptVO> tree = deptService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+ public R<List<DeptVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser,String userId) {
+ List<DeptVO> tree = deptService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId,userId);
+ return R.data(tree);
+ }
+
+ /**
+ * 懒加载获取部门树形结构,根据辖区查询
+ */
+ @GetMapping("/lazy-tree-jurisdiction")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "懒加载树形结构", notes = "树形结构")
+ public R<List<DeptVO>> lazyTreeJurisdiction(String jurisdiction, Long parentId) {
+ List<DeptVO> tree = deptService.lazyTreeJurisdiction(jurisdiction,parentId);
return R.data(tree);
}
@@ -145,8 +157,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 +240,19 @@
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);
}
+
+
+ @GetMapping("/selectInfos")
+ public R<List<DeptVO>> selectInfos() {
+ List<DeptVO> tree =deptService.selectInfos();
+ return R.data(tree);
+ }
+
+
}
--
Gitblit v1.9.3