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 dc8b3a42c..b89602d29 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 @@ -325,14 +325,6 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { } saveAttachment(dto.getAttachmentList(), instance.getId(), task.getId()); - // 完成任务,审批通过 -// if (StringUtils.hasLength(task.getExecutionId())) { - taskService.complete(task.getId(), runtimeService.getVariables(task.getExecutionId())); -// } else { - //加签子任务 没有executionId -// taskService.complete(task.getId()); -// } - //add by zuoqinbo 处理加签[分为向前加签和向后加签]或转交的任务 String parentTaskId = task.getParentTaskId(); if (StringUtils.hasLength(parentTaskId)) { @@ -360,6 +352,8 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { } } } + // 完成任务,审批通过 + taskService.complete(task.getId(), runtimeService.getVariables(task.getExecutionId())); } private void recursionCompleteParentTask(String parentTaskId) {