From 31c1df316d7e9bd01ec2cade17c4704917edb7b5 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 16 Apr 2024 17:16:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E4=BC=98=E5=8C=96=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=A0=A1=E9=AA=8C=E7=9A=84=E5=BC=82=E5=B8=B8=E6=96=87?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java   | 3 ---
 .../workflow/core/engine/cmd/helper/CustomTaskHelper.java     | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java
index 7afe5cde2..337dbb2d8 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java
@@ -85,9 +85,6 @@ public class CustomApproveTaskCmd implements Command<Void>, Serializable {
         HistoricTaskInstance historicTaskInstance = taskQuery.taskId(taskId).singleResult();
 
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-        if (Objects.isNull(task)) {
-            log.info("任务不存在: {}", taskId);
-        }
         validTask(historicTaskInstance, (TaskEntity) task, approver);
 
         if (StringUtils.hasLength(advice)) {
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java
index 8c8f6b63d..8aaa69247 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java
@@ -100,7 +100,8 @@ public class CustomTaskHelper {
      */
     public static void validTask(HistoricTaskInstance historicTaskInstance, TaskEntity taskEntity,
                                  BpmnTaskDelegateAssigner originTaskAssigner) {
-        if (Objects.nonNull(historicTaskInstance) && Objects.nonNull(historicTaskInstance.getEndTime())) {
+        if (Objects.nonNull(historicTaskInstance) &&
+                (Objects.nonNull(historicTaskInstance.getEndTime()) || Objects.isNull(taskEntity))) {
             throw new WorkflowEngineException(TASK_HAS_BEEN_COMPLETE);
         }
 
@@ -194,6 +195,7 @@ public class CustomTaskHelper {
         task.setProcessInstanceId(processInstanceId);
         return addComment(commandContext, task, type, message);
     }
+
     public static Comment addComment(CommandContext commandContext, Task task, String type, String message) {
         ProcessEngineConfigurationImpl processEngineConfiguration =
                 CommandContextUtil.getProcessEngineConfiguration(commandContext);