From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 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 707d433..5e7dc6e 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -35,6 +35,7 @@
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.node.TreeNodes;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.wrapper.DeptWrapper;
@@ -126,6 +127,9 @@
return R.data(tree);
}
+
+
+
/**
* 懒加载获取部门树形结构
*/
@@ -133,6 +137,26 @@
@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
public R<List<DeptVO>> lazyTrees() {
List<DeptVO> tree = deptService.lazyTrees();
+ 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);
+ }
+
+ /**
+ * 懒加载获取部门树形结构(包含用户数据),只查下一级的数据
+ * @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);
}
@@ -168,4 +192,13 @@
return R.data(deptService.selectIn());
}
+ /**
+ * 懒加载获取部门树形结构,不包含顶级管理员公安局
+ */
+ @GetMapping("/security_lazy-tree")
+ @ApiOperation(value = "懒加载树形结构", notes = "树形结构")
+ public R<List<DeptVO>> securityLazyTree(String jurisdiction, Long parentId,Long deptId) {
+ List<DeptVO> tree = deptService.securityLazyTree(jurisdiction,parentId,deptId);
+ return R.data(tree);
+ }
}
--
Gitblit v1.9.3