diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java index 8728e8c27..25c005f6d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java @@ -151,7 +151,11 @@ public class ActTaskServiceImpl implements IActTaskService { //办理意见 taskService.addComment(completeTaskBo.getTaskId(), task.getProcessInstanceId(), TaskStatusEnum.PASS.getStatus(), StringUtils.isBlank(completeTaskBo.getMessage()) ? "同意" : completeTaskBo.getMessage()); //办理任务 - taskService.complete(completeTaskBo.getTaskId(), completeTaskBo.getVariables()); + if (CollUtil.isNotEmpty(completeTaskBo.getVariables())) { + taskService.complete(completeTaskBo.getTaskId(), completeTaskBo.getVariables()); + } else { + taskService.complete(completeTaskBo.getTaskId()); + } List list = taskService.createTaskQuery().taskTenantId(TenantHelper.getTenantId()).processInstanceId(task.getProcessInstanceId()).list(); if (CollUtil.isEmpty(list)) { UpdateBusinessStatusCmd updateBusinessStatusCmd = new UpdateBusinessStatusCmd(task.getProcessInstanceId(), BusinessStatusEnum.FINISH.getStatus()); diff --git a/script/bpmn/请假流程(会签)-leave5.zip b/script/bpmn/请假流程(会签)-leave5.zip new file mode 100644 index 000000000..a5e03efce Binary files /dev/null and b/script/bpmn/请假流程(会签)-leave5.zip differ diff --git a/script/bpmn/请假流程(包容网关)-leave4.zip b/script/bpmn/请假流程(包容网关)-leave4.zip new file mode 100644 index 000000000..41f129619 Binary files /dev/null and b/script/bpmn/请假流程(包容网关)-leave4.zip differ diff --git a/script/bpmn/请假流程(并行网关)-leave3.zip b/script/bpmn/请假流程(并行网关)-leave3.zip new file mode 100644 index 000000000..8f7ffb08f Binary files /dev/null and b/script/bpmn/请假流程(并行网关)-leave3.zip differ diff --git a/script/bpmn/请假流程(排他网关)-leave2.zip b/script/bpmn/请假流程(排他网关)-leave2.zip new file mode 100644 index 000000000..7555193a5 Binary files /dev/null and b/script/bpmn/请假流程(排他网关)-leave2.zip differ diff --git a/script/bpmn/请假流程(普通流程)-leave1.zip b/script/bpmn/请假流程(普通流程)-leave1.zip new file mode 100644 index 000000000..d85f86675 Binary files /dev/null and b/script/bpmn/请假流程(普通流程)-leave1.zip differ