From bc236dd60f271f4645ae0f64666037bbc75a9776 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 16 Apr 2024 11:36:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=E7=9A=84=E4=B8=BB=E8=A6=81=E5=8A=A8=E4=BD=9C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/core/engine/cmd/helper/CustomTaskHelper.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 f5c10d602..8c8f6b63d 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,13 +100,13 @@ public class CustomTaskHelper {
      */
     public static void validTask(HistoricTaskInstance historicTaskInstance, TaskEntity taskEntity,
                                  BpmnTaskDelegateAssigner originTaskAssigner) {
-        if (Objects.isNull(taskEntity)) {
-            throw new WorkflowEngineException(TASK_COMPLETE_FAIL_NOT_EXISTS);
-        }
-
         if (Objects.nonNull(historicTaskInstance) && Objects.nonNull(historicTaskInstance.getEndTime())) {
             throw new WorkflowEngineException(TASK_HAS_BEEN_COMPLETE);
         }
+
+        if (Objects.isNull(historicTaskInstance) && Objects.isNull(taskEntity)) {
+            throw new WorkflowEngineException(TASK_COMPLETE_FAIL_NOT_EXISTS);
+        }
         // FIXME by wangli: currentAssignee 去掉 OUID 前的代码
         //        if (Objects.nonNull(originTaskAssigner) &&
         //                !Objects.equals(taskEntity.getAssignee(), originTaskAssigner.buildAssigneeId())) {