From 6beeb715fcef8db22b17c309ec8fecc45cc04b00 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 16:30:47 +0800
Subject: [PATCH] 1.考试成绩查询修改 2.用户查询修改
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 8cbc014..4f6cb31 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -33,7 +33,9 @@
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.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 +61,8 @@
public class DeptController extends BladeController {
private final IDeptService deptService;
+
+ private final IUserService userService;
/**
* 详情
@@ -135,6 +139,26 @@
return R.data(tree);
}
+
+ /**
+ * 懒加载获取部门树形结构(包含用户数据)app
+ * @param type 1:保安对保安 2：保安向民警 3：民警向民警
+ * @return
+ */
+ @GetMapping("/lazy-tree-user-app")
+ 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);
+ }
+
/**
* 懒加载获取部门树形结构,不包含顶级管理员公安局
*/
--
Gitblit v1.9.3