From f199a0c4f136968df984976b64de09f5deebc28c Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Wed, 17 Jan 2024 13:57:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=AF=84=E8=AE=BA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8D=E5=8F=AF=E8=AF=84=E8=AE=BA=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/core/common/code/BpmnInstanceRespCode.java     | 1 +
 .../axzo/workflow/core/engine/cmd/CustomCommentTaskCmd.java | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnInstanceRespCode.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnInstanceRespCode.java
index 615dfe48a..7a49288d4 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnInstanceRespCode.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnInstanceRespCode.java
@@ -24,6 +24,7 @@ public enum BpmnInstanceRespCode implements IModuleRespCode {
     PROCESS_INSTANCE_CANT_UPDATE("009", "流程实例不能更新"),
     PROCESS_INSTANCE_CANT_DELETE("010", "流程实例不能删除"),
     PROCESS_INSTANCE_CANT_START("011", "流程实例不能启动"),
+    TASK_CANT_COMMENT_INSTANCE_NOT_EXISTS("012", "流程实例【{}】不存在, 不能评论"),
     ;
     private String code;
     private String message;
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCommentTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCommentTaskCmd.java
index e4580f09e..5a4bbb1c3 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCommentTaskCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCommentTaskCmd.java
@@ -3,6 +3,7 @@ package cn.axzo.workflow.core.engine.cmd;
 import cn.axzo.workflow.common.model.request.bpmn.task.AttachmentDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCommentExtDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
+import cn.axzo.workflow.core.common.exception.WorkflowEngineException;
 import cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper;
 import cn.axzo.workflow.core.service.ExtAxHiTaskInstService;
 import com.alibaba.fastjson.JSON;
@@ -33,6 +34,7 @@ import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_COMMEN
 import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_TASK_RELATION_ASSIGNEE_INFO;
 import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_COMMENT;
 import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.COMMENTED;
+import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.TASK_CANT_COMMENT_INSTANCE_NOT_EXISTS;
 import static org.flowable.task.api.Task.DEFAULT_PRIORITY;
 
 /**
@@ -68,7 +70,9 @@ public class CustomCommentTaskCmd implements Command<Void>, Serializable {
 
         HistoricProcessInstance processInstance =
                 historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
-
+        if (Objects.isNull(processInstance)) {
+            throw new WorkflowEngineException(TASK_CANT_COMMENT_INSTANCE_NOT_EXISTS, processInstanceId);
+        }
         TaskService taskService = processEngineConfiguration.getTaskService();
         IdGenerator idGenerator = processEngineConfiguration.getIdGenerator();