From 098b09c3b90a44b12dd005d8f89be4efd0298e5a Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 22 May 2024 14:19:13 +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=E6=94=AF=E6=8C=81=E4=B8=8D=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=85=83=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/engine/cmd/CustomCompleteDummyTaskCmd.java | 8 +++++--- .../core/service/impl/BpmnProcessTaskServiceImpl.java | 3 ++- 2 files changed, 7 insertions(+), 4 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 67f73de8d..6a9f920af 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 @@ -62,9 +62,11 @@ public class CustomCompleteDummyTaskCmd implements Command, Serializable { taskService.saveTask(task); } - Authentication.setAuthenticatedUserId("system"); - CustomTaskHelper.addComment(commandContext, task, COMMENT_TYPE_OPERATION_DESC, operationDesc); - Authentication.setAuthenticatedUserId(null); + if (StringUtils.hasText(operationDesc)) { + Authentication.setAuthenticatedUserId("system"); + CustomTaskHelper.addComment(commandContext, task, COMMENT_TYPE_OPERATION_DESC, operationDesc); + Authentication.setAuthenticatedUserId(null); + } taskService.complete(task.getId()); 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 80f16290c..6c1224225 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 @@ -645,7 +645,8 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor(); commandExecutor.execute(new CustomCompleteDummyTaskCmd(dto.getProcessInstanceId(), dto.getTaskId(), Objects.isNull(dto.getRobotNode()) ? null : dto.getRobotNode().getFlowNodeName(), - dto.getRobotNode().getOperationDesc(), extAxHiTaskInstService)); + Objects.isNull(dto.getRobotNode()) ? null : dto.getRobotNode().getOperationDesc(), + extAxHiTaskInstService)); } @Override