diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java
index 590f846..9f51427 100644
--- a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java
+++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java
@@ -4,6 +4,7 @@ import com.alibaba.cola.exception.BizException;
 import com.jjb.saas.framework.auth.model.SSOUser;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.safetyDutyList.command.query.tasklist.MessageNoticeExe;
+import com.zcloud.safetyDutyList.domain.enums.TaskStatusEnum;
 import com.zcloud.safetyDutyList.domain.gateway.tasklist.*;
 import com.zcloud.safetyDutyList.domain.model.tasklist.FeedbackE;
 import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE;
@@ -53,11 +54,17 @@ public class FeedbackAddExe {
         if (detailE == null) {
             throw new BizException("任务模板不存在");
         }
+        if (detailE.getTaskStatus().equals(TaskStatusEnum.IN_PROGRESS.getCode())) {
+            throw new BizException("任务已完成或已关闭，反馈已截止");
+        }
 
         TaskListIssueE issueE = taskListIssueGateway.getByTaskIssueId(executionE.getTaskIssueId());
         if (issueE == null) {
             throw new BizException("清单下发记录不存在");
         }
+        if (issueE.getStatus().equals(TaskStatusEnum.IN_PROGRESS.getCode())) {
+            throw new BizException("清单已完成或已关闭，反馈已截止");
+        }
 
         FeedbackE feedbackE = new FeedbackE();
         if (StringUtil.isNotBlank(cmd.getFeedbackId())) {
@@ -90,7 +97,7 @@ public class FeedbackAddExe {
         List<FeedbackE> existingFeedbacks = feedbackGateway.listByTaskExecutionIdAndPeriodFlag(
                 executionE.getTaskExecutionId(), periodFlag);
         if (existingFeedbacks != null && existingFeedbacks.size() == 1) {
-            messageNoticeExe.sendMessageCompleteEvent(issueE.getId());
+            messageNoticeExe.sendMessageCompleteEvent(detailE.getId());
         }
 
         FeedbackCO co = new FeedbackCO();
diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/SendTodoMessageExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/SendTodoMessageExe.java
index 6039a92..fe31914 100644
--- a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/SendTodoMessageExe.java
+++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/SendTodoMessageExe.java
@@ -63,7 +63,6 @@ public class SendTodoMessageExe {
                 taskListName = taskListE.getTaskListName();
             }
 
-            Boolean isSendMessage = false;
             for (TaskExecutionE executionE : executionList) {
 
                 // 不是进行中就返回
@@ -93,11 +92,6 @@ public class SendTodoMessageExe {
                     continue;
                 }
 
-                isSendMessage = true;
-                break;
-            }
-
-            if (isSendMessage) {
                 // 发送消息提醒
                 Map<String, Object> sendParams = new HashMap <>();
                 sendParams.put("listName", taskListName);
@@ -109,7 +103,7 @@ public class SendTodoMessageExe {
                         "您有一条任务清单待反馈，清单名称：【" + taskListName + "】",
                         "待反馈",
                         issueE.getId(),
-                        issueE.getId());
+                        executionE.getId());
             }
         }
         log.info("【定时任务3】待办消息发送完成");