From 7f6eec796565735fc8ad0a1746e4558291fadbfb Mon Sep 17 00:00:00 2001 From: konbai <1527468660@qq.com> Date: Sat, 24 Dec 2022 01:32:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E4=BB=BB=E5=8A=A1=E8=8A=82=E7=82=B9=E6=9C=89=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=AF=BC=E8=87=B4=E5=90=AF=E5=8A=A8=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/service/impl/WfTaskServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java index 467536c8..8fe2069c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java @@ -678,13 +678,14 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ @Override public void startFirstTask(ProcessInstance processInstance, Map variables) { // 若第一个用户任务为发起人，则自动完成任务 - Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult(); - if (ObjectUtil.isNotEmpty(task)) { + List tasks = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).list(); + if (CollUtil.isNotEmpty(tasks)) { String userIdStr = (String) variables.get(TaskConstants.PROCESS_INITIATOR); - if (StrUtil.equals(task.getAssignee(), userIdStr)) { - taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(), LoginHelper.getNickName() + "发起流程申请"); - // taskService.setAssignee(task.getId(), userIdStr); - taskService.complete(task.getId(), variables); + for (Task task : tasks) { + if (StrUtil.equals(task.getAssignee(), userIdStr)) { + taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(), LoginHelper.getNickName() + "发起流程申请"); + taskService.complete(task.getId(), variables); + } } } }