From 830bc1621fa7dc468c95ce56082a10343c0b830b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 23:12:28 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
index 0273f65..019d65e 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
@@ -233,6 +233,9 @@
.ge(TTask::getImplementTime, startOfMonth)
.le(TTask::getImplementTime, endOfMonth).list();
List<String> taskIds = finishTask.stream().map(TTask::getId).collect(Collectors.toList());
+ if (taskIds.isEmpty()){
+ taskIds.add("-1");
+ }
List<TTaskDetail> taskDetails = taskDetailService.lambdaQuery()
.eq(TTaskDetail::getAuditStatus, 1).in(TTaskDetail::getTaskId, taskIds)
.isNotNull(TTaskDetail::getClearStatus)
@@ -620,7 +623,7 @@
dto.setAuditTime(LocalDateTime.now());
leaveService.updateById(dto);
SysUser sysUser = sysUserService.selectUserById(Long.valueOf(dto.getLeavePerson()));
- TLeaveAudit leaveAudit = leaveAuditService.lambdaQuery().eq(TLeaveAudit::getAuditId, dto.getId())
+ TLeaveAudit leaveAudit = leaveAuditService.lambdaQuery().eq(TLeaveAudit::getLeaveId, dto.getId())
.eq(TLeaveAudit::getAuditType, 2).one();
TNotice tNotice = new TNotice();
tNotice.setUserId(leaveAudit.getAuditId().split(",")[0]);
--
Gitblit v1.7.1