From c0998459627bdd0fd1e5d3f859127813878d15f4 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Wed, 22 May 2024 14:12:29 +0800
Subject: [PATCH] =?UTF-8?q?update(REQ-2324)=20-=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9C=BA=E5=99=A8=E4=BA=BA=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=9B=B4=E6=96=B0=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=BA=BA=E8=8A=82=E7=82=B9=E4=BF=A1=E6=81=AF=E4=BC=9A=E6=8A=9B?=
 =?UTF-8?q?=E5=87=BA=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/engine/cmd/CustomCompleteDummyTaskCmd.java        | 7 +++++--
 .../core/service/impl/BpmnProcessTaskServiceImpl.java      | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCompleteDummyTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCompleteDummyTaskCmd.java
index d204e31d3..67f73de8d 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCompleteDummyTaskCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCompleteDummyTaskCmd.java
@@ -13,6 +13,7 @@ import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.flowable.engine.impl.util.CommandContextUtil;
 import org.flowable.task.api.Task;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.io.Serializable;
 import java.util.List;
@@ -56,8 +57,10 @@ public class CustomCompleteDummyTaskCmd implements Command<Void>, Serializable {
         if (Objects.isNull(task)) {
             throw new WorkflowEngineException(DUMMY_TASK_NOT_EXISTS, processInstanceId, taskId);
         }
-        task.setName(flowNodeName);
-        taskService.saveTask(task);
+        if (StringUtils.hasText(flowNodeName)) {
+            task.setName(flowNodeName);
+            taskService.saveTask(task);
+        }
 
         Authentication.setAuthenticatedUserId("system");
         CustomTaskHelper.addComment(commandContext, task, COMMENT_TYPE_OPERATION_DESC, operationDesc);
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
index 000c40d3f..80f16290c 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
@@ -644,7 +644,8 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
     public void completeRobotTask(BpmnRobotTaskCompleteDTO dto) {
         CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
         commandExecutor.execute(new CustomCompleteDummyTaskCmd(dto.getProcessInstanceId(), dto.getTaskId(),
-                dto.getRobotNode().getFlowNodeName(), dto.getRobotNode().getOperationDesc(), extAxHiTaskInstService));
+                Objects.isNull(dto.getRobotNode()) ? null : dto.getRobotNode().getFlowNodeName(),
+                dto.getRobotNode().getOperationDesc(), extAxHiTaskInstService));
     }
 
     @Override