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 |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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 ba91200..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;
@@ -150,6 +151,16 @@
 	}
 
 	/**
+	 * 懒加载获取部门树形结构(包含用户数据),只查下一级的数据
+	 * @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);
+	}
+
+	/**
 	 * 新增或修改
 	 */
 	@PostMapping("/submit")
@@ -186,8 +197,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,Long deptId) {
+		List<DeptVO> tree = deptService.securityLazyTree(jurisdiction,parentId,deptId);
 		return R.data(tree);
 	}
 }

--
Gitblit v1.9.3