From f3e242577a231a0477fcd3813ae0c436db85db4b Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 9 Aug 2024 09:29:22 +0800 Subject: [PATCH] =?UTF-8?q?fix=20-=20=E5=A4=84=E7=90=86=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BA=BA=E7=9A=84=20operationDesc=20=E8=A2=AB=E6=84=8F?= =?UTF-8?q?=E5=A4=96=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java | 3 ++- .../workflow/core/engine/job/AsyncApproveTaskJobHandler.java | 3 ++- 2 files changed, 4 insertions(+), 2 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 d298162de..843bb1dd7 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 @@ -94,7 +94,8 @@ public class CustomApproveTaskCmd extends AbstractCommand implements Seria this.approver = dto.getApprover(); this.nextApprover = dto.getNextApprover(); this.nodeTypes = dto.getNodeTypes(); - if (StringUtils.hasText(operationDesc)) { + // 这里的不能直接使用字符串的比较，因为外部可能传入空字符串，比如发起人的通过时，就是传入的空字符串 + if (Objects.nonNull(operationDesc)) { this.operationDesc = operationDesc; } } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncApproveTaskJobHandler.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncApproveTaskJobHandler.java index 1d5f81dd6..167ba3c2c 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncApproveTaskJobHandler.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncApproveTaskJobHandler.java @@ -44,7 +44,8 @@ public class AsyncApproveTaskJobHandler extends AbstractExecuteWithLockJobHandle } CustomApproveTaskCmd command = new CustomApproveTaskCmd(dto); if (Objects.equals(task.getTaskDefinitionKey(), NODE_STARTER.getType())) { - command = new CustomApproveTaskCmd(dto); + // 这里的 operationDesc 设置为“” 是为了在日志中不显示（已通过） + command = new CustomApproveTaskCmd(dto, ""); } processEngineConfiguration.getCommandExecutor().execute(command); }