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 843bb1dd7..1c449dded 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 @@ -54,7 +54,7 @@ public class CustomApproveTaskCmd extends AbstractCommand implements Seria * 在日志中一般出现在节点名称的下方 * 不传,默认"已通过" */ - private String operationDesc = "已通过"; + private String operationDesc; /** * 附件, 可为空 */ @@ -84,7 +84,8 @@ public class CustomApproveTaskCmd extends AbstractCommand implements Seria } public CustomApproveTaskCmd(BpmnTaskAuditDTO dto) { - this(dto, dto.getOperationDesc()); + this(dto, null); + this.operationDesc = dto.getOperationDesc(); } public CustomApproveTaskCmd(BpmnTaskAuditDTO dto, String operationDesc) { @@ -95,28 +96,11 @@ public class CustomApproveTaskCmd extends AbstractCommand implements Seria this.nextApprover = dto.getNextApprover(); this.nodeTypes = dto.getNodeTypes(); // 这里的不能直接使用字符串的比较,因为外部可能传入空字符串,比如发起人的通过时,就是传入的空字符串 - if (Objects.nonNull(operationDesc)) { - this.operationDesc = operationDesc; - } - } - - public CustomApproveTaskCmd(String taskId, String advice, String operationDesc, List attachmentList, - BpmnTaskDelegateAssigner approver, BpmnTaskDelegateAssigner nextApprover) { - this(taskId, advice, operationDesc, attachmentList, approver, nextApprover, null); - } - - public CustomApproveTaskCmd(String taskId, String advice, String operationDesc, List attachmentList, - BpmnTaskDelegateAssigner approver, BpmnTaskDelegateAssigner nextApprover, - List nodeTypes) { - this.taskId = taskId; - this.advice = advice; if (StringUtils.hasText(operationDesc)) { this.operationDesc = operationDesc; + } else { + this.operationDesc = "已通过"; } - this.attachmentList = attachmentList; - this.approver = approver; - this.nextApprover = nextApprover; - this.nodeTypes = nodeTypes; } @Override diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomRejectionTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomRejectionTaskCmd.java index 11d77c819..6258cfc95 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomRejectionTaskCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomRejectionTaskCmd.java @@ -47,7 +47,7 @@ public class CustomRejectionTaskCmd extends AbstractCommand implements Ser private final String taskId; private final String advice; - private String operationDesc = "已驳回"; + private String operationDesc; private final List attachmentList; private final BpmnTaskDelegateAssigner approver; private final ExtAxHiTaskInstService extAxHiTaskInstService; @@ -57,7 +57,8 @@ public class CustomRejectionTaskCmd extends AbstractCommand implements Ser private final List nodeTypes; public CustomRejectionTaskCmd(BpmnTaskAuditDTO dto, ExtAxHiTaskInstService extAxHiTaskInstService) { - this(dto, extAxHiTaskInstService, dto.getOperationDesc()); + this(dto, extAxHiTaskInstService, null); + this.operationDesc = dto.getOperationDesc(); } public CustomRejectionTaskCmd(BpmnTaskAuditDTO dto, ExtAxHiTaskInstService extAxHiTaskInstService, String operationDesc) { @@ -65,6 +66,8 @@ public class CustomRejectionTaskCmd extends AbstractCommand implements Ser this.advice = dto.getAdvice(); if (StringUtils.hasText(operationDesc)) { this.operationDesc = operationDesc; + } else { + this.operationDesc = "已驳回"; } this.attachmentList = dto.getAttachmentList(); this.approver = dto.getApprover();