perf: 优化 工作流任务获取当前用户id改用 TaskUtils.getUserId() 获取。

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<WfTaskVo> selectPageOwnProcessList(ProcessQuery processQuery, PageQuery pageQuery) {
         Page<WfTaskVo> 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<WfTaskVo> selectPageTodoProcessList(ProcessQuery processQuery, PageQuery pageQuery) {
         Page<WfTaskVo> 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<WfTaskVo> selectPageClaimProcessList(ProcessQuery processQuery, PageQuery pageQuery) {
         Page<WfTaskVo> 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<WfTaskVo> selectPageFinishedProcessList(ProcessQuery processQuery, PageQuery pageQuery) {
         Page<WfTaskVo> page = new Page<>();
-        Long userId = LoginHelper.getUserId();
         HistoricTaskInstanceQuery taskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
             .includeProcessVariables()
             .finished()
-            .taskAssignee(userId.toString())
+            .taskAssignee(TaskUtils.getUserId())
             .orderByHistoricTaskInstanceEndTime()
             .desc();
         // 构建搜索条件

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(), TaskUtils.getUserId());
-            taskService.setAssignee(taskBo.getTaskId(), userId.toString());
             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<EndEvent> 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;