diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java
index 482bba54..d0f3bde1 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java
@@ -26,10 +26,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -1103,7 +1100,7 @@ public class IncomingInspectionTaskControllerService {
                 if (StrUtil.isNotBlank(data.getImageIds())) {
                     dataVO.setImages(
                             fileUploadRecordService.lambdaQuery()
-                                    .in(FileUploadRecord::getId, StrUtil.split(data.getImageIds(), ","))
+                                    .in(FileUploadRecord::getId, Arrays.stream(StrUtil.splitToLong(data.getImageIds(), ",")).boxed().toList())
                                     .list()
                                     .stream()
                                     .map(file -> new FileUploadVO()
diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java
index 5c4018c4..dab4ff1f 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java
@@ -392,10 +392,11 @@ public class QmsSamplingPlanControllerService {
         Page<QmsSamplingPlan> page = new Page<>(request.getPage(), request.getPageSize());
         
         var query = samplingPlanService.lambdaQuery()
-                .like(StrUtil.isNotBlank(request.getPlanCode()), QmsSamplingPlan::getPlanCode, request.getPlanCode())
-                .like(StrUtil.isNotBlank(request.getPlanName()), QmsSamplingPlan::getPlanName, request.getPlanName())
+                .eq(request.getPublishStatus() != null, QmsSamplingPlan::getPublishStatus, request.getPublishStatus())
                 .ge(request.getStartDate() != null, QmsSamplingPlan::getCreateTime, request.getStartDate())
                 .le(request.getEndDate() != null, QmsSamplingPlan::getCreateTime, request.getEndDate())
+                .like(StrUtil.isNotBlank(request.getPlanCode()), QmsSamplingPlan::getPlanCode, request.getPlanCode())
+                .like(StrUtil.isNotBlank(request.getPlanName()), QmsSamplingPlan::getPlanName, request.getPlanName())
                 .orderByAsc(QmsSamplingPlan::getPublishStatus)
                 .orderByDesc(QmsSamplingPlan::getId);
         
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO.java
index 0f81f8f9..a8e907a9 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO.java
@@ -1,6 +1,7 @@
 package com.nflg.wms.common.pojo.qo;
 
 import com.nflg.wms.common.pojo.vo.FileUploadVO;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -26,5 +27,6 @@ public class QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO {
     /**
      * 图片列表
      */
+    @Valid
     private List<FileUploadVO> images;
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanSearchQO.java
index cc099df9..4fce5b71 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanSearchQO.java
@@ -19,4 +19,9 @@ public class QmsSamplingPlanSearchQO extends SearchBaseQO {
      * 方案名称
      */
     private String planName;
+
+    /**
+     * 发布状态：0-未发布，1-已发布，2-已撤回
+     */
+    private Short publishStatus;
 }