From 446d02f0cc901e74591c5fe0452a0017b37c32c2 Mon Sep 17 00:00:00 2001
From: tianxinlei <tianxinlei@zcloudchina.com>
Date: Tue, 26 May 2026 15:10:37 +0800
Subject: [PATCH] 5-26 fix

---
 .../query/tasklist/FeedbackQueryExe.java        | 17 ++++++++++-------
 .../dto/tasklist/FeedbackListQry.java           |  1 -
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java
index 1eefdf8..d68d51e 100644
--- a/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java
@@ -11,6 +11,7 @@ import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE;
 import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*;
 import com.zcloud.safetyDutyList.dto.tasklist.FeedbackListQry;
 import com.zcloud.safetyDutyList.dto.tasklist.FeedbackPeriodGroupQry;
+import jodd.util.StringUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
@@ -66,13 +67,15 @@ public class FeedbackQueryExe {
         if (feedbackList == null || feedbackList.isEmpty()) {
             return MultiResponse.of(new ArrayList<>());
         }
-        List<FeedbackCO> coList = feedbackList.stream()
-                .filter(f -> qry.getFeedbackPeriodFlag().equals(f.getFeedbackPeriodFlag()))
-                .map(f -> {
-                    FeedbackCO co = new FeedbackCO();
-                    BeanUtils.copyProperties(f, co);
-                    return co;
-                }).collect(Collectors.toList());
+        List<FeedbackCO> coList = new ArrayList<>();
+        for (FeedbackE feedbackE : feedbackList) {
+            if (!StringUtil.isEmpty(qry.getFeedbackPeriodFlag()) && !qry.getFeedbackPeriodFlag().equals(feedbackE.getFeedbackPeriodFlag())) {
+                continue;
+            }
+            FeedbackCO co = new FeedbackCO();
+            BeanUtils.copyProperties(feedbackE, co);
+            coList.add(co);
+        }
         return MultiResponse.of(coList);
     }
 
diff --git a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java
index 2022920..f1da474 100644
--- a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java
+++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java
@@ -16,6 +16,5 @@ public class FeedbackListQry {
     @NotEmpty(message = "任务ID不能为空")
     private String taskDetailId;
     @ApiModelProperty(value = "周期标识", required = true)
-    @NotEmpty(message = "周期标识不能为空")
     private String feedbackPeriodFlag;
 }