From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
index 15d0200..e96f3cb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
@@ -269,7 +269,15 @@
@ApiOperation(value = "根据部门/项目部id查询巡检员列表 不分页")
@GetMapping(value = "/listUsers")
public R<List<SysUser>> listUsers(@RequestParam String id) {
- List<SysUser> res = sysUserService.selectUserByDeptId(id);
+ List<String> strings = new ArrayList<>();
+ strings.add(id);
+ TProjectDept projectDept = projectDeptService.getById(id);
+ if (projectDept.getParentId().equals("0")){
+ List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, projectDept.getId())
+ .list().stream().map(TProjectDept::getId).collect(Collectors.toList());
+ strings.addAll(collect);
+ }
+ List<SysUser> res = sysUserService.selectUserByDeptId(strings);
return R.ok(res);
}
@Log(title = "新增点位", businessType = BusinessType.INSERT)
--
Gitblit v1.7.1