From 1a8bd1130284b04008f02a08e5f4e07fe61234a1 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Wed, 27 May 2026 14:17:12 +0800
Subject: [PATCH] commit

---
 .../controller/transact/ProposalUnderTakeReplyController.java  | 3 ++-
 .../service/impl/ProposalCommitteeFilingServiceImpl.java       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java
index 8db1264..61836a6 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java
@@ -141,7 +141,8 @@ public class ProposalUnderTakeReplyController {
         List<NutMap> list = pagination.getList();
         for (NutMap row : list) {
             if (row.getInt("taskIsMaster") == 1) {
-                boolean b = Stream.of("master_reply", "slave_reply", "school_leader")
+                // boolean b = Stream.of("master_reply", "slave_reply", "school_leader")
+                boolean b = Stream.of("master_reply", "slave_reply", "feedback")
                         .anyMatch(a -> row.getString("curTaskKey").contains(a));
                 row.setv("canRevoke", b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode());
             } else {
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalCommitteeFilingServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalCommitteeFilingServiceImpl.java
index 40fd5b5..6be9538 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalCommitteeFilingServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalCommitteeFilingServiceImpl.java
@@ -50,8 +50,9 @@ public class ProposalCommitteeFilingServiceImpl extends BaseServiceImpl<Proposal
     @Aop(TransAop.READ_COMMITTED)
     public void executeTask(Dict args) {
         Long processTaskId = args.getLong(FlowConst.PROCESS_TASK_ID_KEY);
-        flowCommonService.executeTask(args);
+        // 新流程确认立案后直接创建承办单位答复任务，任务拦截器需要先读取承办单位答复记录。
         saveCommitteeFilingBusinessData(processTaskId, args);
+        flowCommonService.executeTask(args);
     }
 
     @Override