From 95dc9774d2855450420e160808bf1ea34fbfa649 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 七月 2025 11:10:11 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
index 463f62a..b4a6ab0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
@@ -16,6 +16,7 @@
import com.ruoyi.system.vo.system.AppealListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -92,7 +93,7 @@
List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
sysUser.getPhonenumber().equals(query.getPhonenumber())
).map(SysUser::getUserId).collect(Collectors.toList());
- if (!query.getPatrolInspectorIds().isEmpty()){
+ if (!CollectionUtils.isEmpty(query.getPatrolInspectorIds())){
// 取交集
patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
}
@@ -178,6 +179,9 @@
@PostMapping(value = "/audit")
public R<Boolean> audit(@RequestBody @Valid TAppealAuditDTO dto) {
TAppeal appeal = appealService.getById(dto.getId());
+ dto.setStatus(dto.getStatus());
+ dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ dto.setAuditTime(LocalDateTime.now());
TTask task = taskCleanService.getById(appeal.getTaskId());
TLocation location = locationService.getById(task.getLocationId());
TNotice tNotice = new TNotice();
--
Gitblit v1.7.1