diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/TestCustomTaskHandler.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/TestCustomTaskHandler.java
index 478328391..fb04cd01f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/TestCustomTaskHandler.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/TestCustomTaskHandler.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component
-@FlowListenerAnnotation(processDefinitionKey = "leave1", taskDefId = "sid-31C52262-04C3-43D8-A3FB-8434017A6572")
+@FlowListenerAnnotation(processDefinitionKey = "leave1", taskDefId = "Activity_14633hx")
 public class TestCustomTaskHandler implements FlowTaskEventHandler {
 
     @Override
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 19c5de554..031d676f3 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -611,7 +611,7 @@ public class ActTaskServiceImpl implements IActTaskService {
             //判断是否有多个任务
             List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).taskTenantId(TenantHelper.getTenantId()).list();
             //申请人节点
-            HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0);
+            HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(processInstanceId).finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0);
             String backTaskDefinitionKey = historicTaskInstance.getTaskDefinitionKey();
             taskService.addComment(task.getId(), processInstanceId, TaskStatusEnum.BACK.getStatus(), StringUtils.isNotBlank(backProcessBo.getMessage()) ? backProcessBo.getMessage() : "退回");
             if (taskList.size() > 1) {
diff --git a/script/bpmn/请假流程（子流程）-leave6.zip b/script/bpmn/请假流程（子流程）-leave6.zip
index ded3cea92..ca53c3bb6 100644
Binary files a/script/bpmn/请假流程（子流程）-leave6.zip and b/script/bpmn/请假流程（子流程）-leave6.zip differ
diff --git a/script/bpmn/请假流程（监听）-leave7.zip b/script/bpmn/请假流程（监听）-leave7.zip
new file mode 100644
index 000000000..0a71e291d
Binary files /dev/null and b/script/bpmn/请假流程（监听）-leave7.zip differ
diff --git a/script/bpmn/请假流程（监听）-leave8.zip b/script/bpmn/请假流程（监听）-leave8.zip
deleted file mode 100644
index 4c655036e..000000000
Binary files a/script/bpmn/请假流程（监听）-leave8.zip and /dev/null differ