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 eae6044ce..77a86d95d 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 @@ -33,6 +33,7 @@ import cn.axzo.workflow.core.service.converter.BpmnTaskDonePageItemConverter; import cn.axzo.workflow.core.service.converter.BpmnTaskTodoPageItemConverter; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.Activity; @@ -337,8 +338,9 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { if (subTaskCount == 0) { //让剩余加签人进行处理 List remainAssignerList = - (List) taskService.getVariable(taskEntity.getId(), + (List) taskService.getVariable(parentTaskId, COUNTERSIGN_REMAIN_ASSIGNER_LIST, List.class); + log.info("加签列表: {}", JSON.toJSONString(remainAssignerList)); //如果加签流程还未流转完,还有剩余加签人 if (!CollectionUtils.isEmpty(remainAssignerList)) { BpmnTaskDelegateAssigner remainAssigner = remainAssignerList.remove(0); @@ -348,6 +350,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { this.createSubTask(taskEntity, parentTaskId, remainAssigner); } else { // 递归上去直到没有 parentId + log.info("加签人与被加签人都审批完毕"); recursionCompleteParentTask(parentTaskId); } } @@ -432,8 +435,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { * @param assigner 子任务的执行人 * @return */ - protected TaskEntity createSubTask(TaskEntity parentTask, String parentTaskId, BpmnTaskDelegateAssigner assigner) { - TaskEntity task = null; + protected void createSubTask(TaskEntity parentTask, String parentTaskId, BpmnTaskDelegateAssigner assigner) { if (parentTask != null) { //1.生成新的工作流子任务 // IdGenerator idGenerator = springProcessEngineConfiguration.getIdGenerator(); @@ -465,12 +467,11 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { // .activityId(parentTask.getTaskDefinitionKey()) // 指定活动ID // .singleResult(); // task.setExecutionId(subExecution.getId()); - log.info("流程加签父任务:{},正在创建加签子任务:{},", parentTaskId, JSONUtil.toJsonStr(Lists.newArrayList(task))); + log.info("流程加签父任务:{},正在创建加签子任务:{},", parentTaskId, JSONUtil.toJsonStr(subTask)); // taskService.saveTask(task); // springProcessEngineConfiguration.getCommandExecutor().execute(new CustomEventAssignment(parentTask.getProcessDefinitionId(), parentTask.getTaskDefinitionKey(), task)); } - return task; } @Override