From 8f7e095eb07de031ce6e286fb19961ed1826864a Mon Sep 17 00:00:00 2001 From: konbai <1527468660@qq.com> Date: Sat, 24 Dec 2022 19:00:47 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E4=BB=BB=E5=8A=A1=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7id=E6=94=B9=E7=94=A8=20TaskUtils.getUserId()?= =?UTF-8?q?=20=E8=8E=B7=E5=8F=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/service/impl/WfProcessServiceImpl.java | 13 ++++--------- .../workflow/service/impl/WfTaskServiceImpl.java | 11 +++++------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java index d38d93de..c9ab9aaa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java @@ -14,7 +14,6 @@ import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.JsonUtils; import com.ruoyi.common.utils.StringUtils; @@ -125,9 +124,8 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce @Override public TableDataInfo selectPageOwnProcessList(ProcessQuery processQuery, PageQuery pageQuery) { Page page = new Page<>(); - Long userId = LoginHelper.getUserId(); HistoricProcessInstanceQuery historicProcessInstanceQuery = historyService.createHistoricProcessInstanceQuery() - .startedBy(userId.toString()) + .startedBy(TaskUtils.getUserId()) .orderByProcessInstanceStartTime() .desc(); // 构建搜索条件 @@ -177,11 +175,10 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce @Override public TableDataInfo selectPageTodoProcessList(ProcessQuery processQuery, PageQuery pageQuery) { Page page = new Page<>(); - Long userId = LoginHelper.getUserId(); TaskQuery taskQuery = taskService.createTaskQuery() .active() .includeProcessVariables() - .taskCandidateOrAssigned(userId.toString()) + .taskCandidateOrAssigned(TaskUtils.getUserId()) .taskCandidateGroupIn(TaskUtils.getCandidateGroup()) .orderByTaskCreateTime().desc(); // 构建搜索条件 @@ -228,11 +225,10 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce @Override public TableDataInfo selectPageClaimProcessList(ProcessQuery processQuery, PageQuery pageQuery) { Page page = new Page<>(); - Long userId = LoginHelper.getUserId(); TaskQuery taskQuery = taskService.createTaskQuery() .active() .includeProcessVariables() - .taskCandidateUser(userId.toString()) + .taskCandidateUser(TaskUtils.getUserId()) .taskCandidateGroupIn(TaskUtils.getCandidateGroup()) .orderByTaskCreateTime().desc(); // 构建搜索条件 @@ -276,11 +272,10 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce @Override public TableDataInfo selectPageFinishedProcessList(ProcessQuery processQuery, PageQuery pageQuery) { Page page = new Page<>(); - Long userId = LoginHelper.getUserId(); HistoricTaskInstanceQuery taskInstanceQuery = historyService.createHistoricTaskInstanceQuery() .includeProcessVariables() .finished() - .taskAssignee(userId.toString()) + .taskAssignee(TaskUtils.getUserId()) .orderByHistoricTaskInstanceEndTime() .desc(); // 构建搜索条件 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 8fe2069c..a67ce7e5 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 @@ -87,8 +87,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ taskService.resolveTask(taskBo.getTaskId()); } else { taskService.addComment(taskBo.getTaskId(), taskBo.getProcInsId(), FlowComment.NORMAL.getType(), taskBo.getComment()); - Long userId = LoginHelper.getUserId(); - taskService.setAssignee(taskBo.getTaskId(), userId.toString()); + taskService.setAssignee(taskBo.getTaskId(), TaskUtils.getUserId()); if (ObjectUtil.isNotEmpty(taskBo.getVariables())) { taskService.complete(taskBo.getTaskId(), taskBo.getVariables(), true); } else { @@ -348,7 +347,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ // 添加审批意见 taskService.addComment(bo.getTaskId(), task.getProcessInstanceId(), FlowComment.DELEGATE.getType(), commentBuilder.toString()); // 设置办理人为当前登录人 - taskService.setOwner(bo.getTaskId(), LoginHelper.getUserId().toString()); + taskService.setOwner(bo.getTaskId(), TaskUtils.getUserId()); // 执行委派 taskService.delegateTask(bo.getTaskId(), bo.getUserId()); // 设置任务节点名称 @@ -387,7 +386,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ // 添加审批意见 taskService.addComment(bo.getTaskId(), task.getProcessInstanceId(), FlowComment.TRANSFER.getType(), commentBuilder.toString()); // 设置拥有者为当前登录人 - taskService.setOwner(bo.getTaskId(), LoginHelper.getUserId().toString()); + taskService.setOwner(bo.getTaskId(), TaskUtils.getUserId()); // 转办任务 taskService.setAssignee(bo.getTaskId(), bo.getUserId()); // 设置任务节点名称 @@ -418,7 +417,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ Process process = bpmnModel.getMainProcess(); List endNodes = process.findFlowElementsOfType(EndEvent.class, false); if (CollectionUtils.isNotEmpty(endNodes)) { - Authentication.setAuthenticatedUserId(LoginHelper.getUserId().toString()); + Authentication.setAuthenticatedUserId(TaskUtils.getUserId()); // taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.STOP.getType(), // StringUtils.isBlank(flowTaskVo.getComment()) ? "取消申请" : flowTaskVo.getComment()); // 获取当前流程最后一个节点 @@ -455,7 +454,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ String myTaskId = null; HistoricTaskInstance myTask = null; for (HistoricTaskInstance hti : htiList) { - if (LoginHelper.getUserId().toString().equals(hti.getAssignee())) { + if (TaskUtils.getUserId().equals(hti.getAssignee())) { myTaskId = hti.getId(); myTask = hti; break;