From 87afa637bab26418ac5cd2fb0635695c3d5191a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Sun, 15 Dec 2024 18:13:51 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/domain/bo/CompleteTaskBo.java | 2 +- .../service/impl/FlwTaskServiceImpl.java | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java index 59b6c36f1..e2182ca31 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java @@ -37,7 +37,7 @@ public class CompleteTaskBo implements Serializable { /** * 抄送人员 */ - private List FlowCopyList; + private List flowCopyList; /** * 消息类型 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 240ce4a37..a1f8cc8f3 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -135,7 +135,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { List messageType = completeTaskBo.getMessageType(); String notice = completeTaskBo.getNotice(); // 获取抄送人 - List FlowCopyList = completeTaskBo.getFlowCopyList(); + List flowCopyList = completeTaskBo.getFlowCopyList(); FlowTask flowTask = flowTaskMapper.selectById(taskId); Instance ins = insService.getById(flowTask.getInstanceId()); // 获取流程定义信息 @@ -153,7 +153,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { flowParams.hisTaskExt(completeTaskBo.getFileId()); // 执行任务跳转,并根据返回的处理人设置下一步处理人 - setHandler(taskService.skip(taskId, flowParams), flowTask, FlowCopyList); + setHandler(taskService.skip(taskId, flowParams), flowTask, flowCopyList); // 消息通知 WorkflowUtils.sendMessage(definition.getFlowName(), ins.getId(), messageType, notice); return true; @@ -168,14 +168,14 @@ public class FlwTaskServiceImpl implements IFlwTaskService { * * @param instance 实例 * @param task (当前任务)未办理的任务 - * @param FlowCopyList 抄送人 + * @param flowCopyList 抄送人 */ - private void setHandler(Instance instance, FlowTask task, List FlowCopyList) { + private void setHandler(Instance instance, FlowTask task, List flowCopyList) { if (instance == null) { return; } //添加抄送人 - setCopy(task, FlowCopyList); + setCopy(task, flowCopyList); // 根据流程实例ID查询所有关联的任务 List flowTasks = selectByInstId(instance.getId()); List userList = new ArrayList<>(); @@ -201,10 +201,10 @@ public class FlwTaskServiceImpl implements IFlwTaskService { * 添加抄送人 * * @param task 任务信息 - * @param FlowCopyList 抄送人 + * @param flowCopyList 抄送人 */ - private void setCopy(FlowTask task, List FlowCopyList) { - if (CollUtil.isEmpty(FlowCopyList)) { + private void setCopy(FlowTask task, List flowCopyList) { + if (CollUtil.isEmpty(flowCopyList)) { return; } // 添加抄送人记录 @@ -220,16 +220,16 @@ public class FlwTaskServiceImpl implements IFlwTaskService { FlowParams flowParams = FlowParams.build(); flowParams.skipType(SkipType.NONE.getKey()); flowParams.hisStatus(TaskStatusEnum.COPY.getStatus()); - flowParams.message("【抄送给】" + StreamUtils.join(FlowCopyList, FlowCopy::getUserName)); + flowParams.message("【抄送给】" + StreamUtils.join(flowCopyList, FlowCopy::getUserName)); HisTask hisTask = hisTaskService.setSkipHisTask(task, flowNode, flowParams); hisTask.setCreateTime(updateTime); hisTask.setUpdateTime(updateTime); hisTaskService.save(hisTask); - List userList = FlowCopyList.stream() - .map(FlowCopy -> { + List userList = flowCopyList.stream() + .map(flowCopy -> { FlowUser flowUser = new FlowUser(); flowUser.setType(TaskAssigneeType.COPY.getCode()); - flowUser.setProcessedBy(String.valueOf(FlowCopy.getUserId())); + flowUser.setProcessedBy(String.valueOf(flowCopy.getUserId())); flowUser.setAssociated(taskId); return flowUser; }).collect(Collectors.toList());