From 5e2d78f61bf7d1513d5d5c8cd55442133a6e898e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 14 七月 2025 18:23:36 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java | 16 +++++++++++++---
1 files changed, 13 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..a051ac1 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
@@ -141,6 +141,9 @@
List<String> collect = list.stream().map(TTask::getId).collect(Collectors.toList());
List<LocationListTaskVO> res = new ArrayList<>();
+ if (collect.isEmpty()){
+ return R.ok(pageInfo);
+ }
List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class)
.in(TTaskDetail::getTaskId,collect)
.eq(TTaskDetail::getClearStatus, 2)
@@ -272,11 +275,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