From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 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 d8645c9..f16ac02 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;
@@ -33,7 +34,10 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.node.TreeNodes;
import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.wrapper.DeptWrapper;
import org.springframework.web.bind.annotation.*;
@@ -59,6 +63,8 @@
public class DeptController extends BladeController {
private final IDeptService deptService;
+
+ private final IUserService userService;
/**
* 详情
@@ -124,6 +130,17 @@
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);
+ }
+
/**
* 懒加载获取部门树形结构(包含用户数据)
@@ -135,6 +152,16 @@
return R.data(tree);
}
+ /**
+ * 懒加载获取部门树形结构(包含用户数据),只查下一级的数据
+ * @return
+ */
+ @GetMapping("/lazy-tree-users")
+ public R<List<TreeNodes>> lazyTreeUsers(Integer type,Long deptId) {
+ List<TreeNodes> tree = deptService.lazyTreeUsers(type,deptId);
+ return R.data(tree);
+ }
+
/**
* 懒加载获取部门树形结构(包含用户数据)app
@@ -142,8 +169,17 @@
* @return
*/
@GetMapping("/lazy-tree-user-app")
- public List<DeptVO> lazyTreeUser(Integer type) {
- return deptService.lazyTreeUserApp(type);
+ public List<DeptVO> lazyTreeUser(Integer type,String userId) {
+ if (null!=userId && userId!=""){
+ //查询用户信息
+ User user = userService.getById(userId);
+ type = 4;
+ if (null!=user.getJurisdiction() && user.getJurisdiction()!="") {
+ return deptService.lazyTreeUserApp(type, user.getJurisdiction());
+ }
+ return deptService.lazyTreeUserApp(type,null);
+ }
+ return deptService.lazyTreeUserApp(type,null);
}
/**
@@ -151,8 +187,8 @@
*/
@GetMapping("/security_lazy-tree")
@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);
+ public R<List<DeptVO>> securityLazyTree(String jurisdiction, Long parentId) {
+ List<DeptVO> tree = deptService.securityLazyTree(jurisdiction, parentId);
return R.data(tree);
}
@@ -204,8 +240,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