From 4e0b0be90a8bf14a59f4cfee7959534adea24ba3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 七月 2025 18:45:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 e96f3cb..be5c135 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
@@ -272,11 +272,18 @@
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());
+ if (projectDept!=null){
+ 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);
+ }
+ }else{
+ List<String> collect = deptService.lambdaQuery().eq(TDept::getId, id)
+ .list().stream().map(TDept::getId).collect(Collectors.toList());
strings.addAll(collect);
}
+
List<SysUser> res = sysUserService.selectUserByDeptId(strings);
return R.ok(res);
}
--
Gitblit v1.7.1