From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回

---
 src/main/java/org/springblade/modules/system/controller/DeptController.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 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..b6c32d9 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;
@@ -32,17 +33,22 @@
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.information.service.IInformationService;
 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.service.MyAsyncService;
 import org.springblade.modules.system.vo.DeptVO;
 import org.springblade.modules.system.wrapper.DeptWrapper;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -64,6 +70,8 @@
 	private final IDeptService deptService;
 
 	private final IUserService userService;
+	private final IInformationService informationService;
+	private final MyAsyncService myAsyncService;
 
 	/**
 	 * 详情
@@ -124,8 +132,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 +164,21 @@
 	 * @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);
+	}
+
+
+	/**
+	 * 懒加载获取单位树,电子围栏用
+	 * @param type 1：本单位  2：分公司  3：服务单位
+	 * @param deptId
+	 * @return
+	 */
+	@GetMapping("/lazy-tree-rail")
+	public R<List<DeptVO>> lazyTreeRail(Integer type,Long deptId) {
+		List<DeptVO> tree = deptService.lazyTreeRail(type,deptId);
 		return R.data(tree);
 	}
 
@@ -175,8 +207,8 @@
 	 */
 	@GetMapping("/security_lazy-tree")
 	@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
-	public R<List<DeptVO>> securityLazyTree(String jurisdiction, Long parentId) {
-		List<DeptVO> tree = deptService.securityLazyTree(jurisdiction, parentId);
+	public R<List<DeptVO>> securityLazyTree(String jurisdiction, Long parentId,Long deptId) {
+		List<DeptVO> tree = deptService.securityLazyTree(jurisdiction, parentId,deptId);
 		return R.data(tree);
 	}
 
@@ -228,8 +260,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