From 4fabd4f39953b8f58f7ba59adb1c44e971a9f65f Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Wed, 4 Dec 2024 16:43:34 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8A=9E=E7=90=86=E4=BA=BA=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/workflow/domain/vo/WfCopy.java | 6 ++++++ .../workflow/service/impl/FlwInstanceServiceImpl.java | 1 - .../workflow/service/impl/FlwTaskServiceImpl.java | 9 ++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java index 88a5a2184..a3f5966f6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java @@ -5,6 +5,8 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import static org.dromara.common.core.enums.TaskAssigneeEnum.USER; + /** * 抄送 * @@ -26,4 +28,8 @@ public class WfCopy implements Serializable { */ private String userName; + public String getUserId() { + return USER.getCode() + userId; + } + } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index fe454d94c..b86a8a485 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -168,7 +168,6 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { AssertUtil.isNull(startNode, ExceptionCons.LOST_START_NODE); Node nextNode = nodeService.getNextNode(definition.getId(), startNode.getNodeCode(), null, SkipType.NONE.getKey()); FlowParams flowParams = FlowParams.build(); - flowParams.handler(LoginHelper.getUserIdStr()); flowParams.nodeCode(nextNode.getNodeCode()); flowParams.message(bo.getMessage()); flowParams.flowStatus(BusinessStatusEnum.CANCEL.getStatus()).hisStatus(TaskStatusEnum.CANCEL.getStatus()); 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 6b50481fa..da866bf8f 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 @@ -83,14 +83,13 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { @Transactional(rollbackFor = Exception.class) public Map startWorkFlow(StartProcessBo startProcessBo) { String businessKey = startProcessBo.getBusinessKey(); - String userId = LoginHelper.getUserIdStr(); if (StringUtils.isBlank(businessKey)) { throw new ServiceException("启动工作流时必须包含业务ID"); } // 启动流程实例（提交申请） Map variables = startProcessBo.getVariables(); // 流程发起人 - variables.put(INITIATOR, userId); + variables.put(INITIATOR, LoginHelper.getUserIdStr()); // 业务id variables.put(BUSINESS_KEY, businessKey); WfDefinitionConfigVo wfDefinitionConfigVo = wfDefinitionConfigService.getByTableNameLastVersion(startProcessBo.getTableName()); @@ -135,9 +134,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { @Transactional(rollbackFor = Exception.class) public boolean completeTask(CompleteTaskBo completeTaskBo) { try { - // 获取当前用户ID作为任务处理人 - String userId = LoginHelper.getUserIdStr(); - // 获取任务ID并查询对应的流程任务和实例信息 Long taskId = completeTaskBo.getTaskId(); // 获取抄送人 @@ -228,7 +224,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { FlowParams flowParams = FlowParams.build(); flowParams.skipType(SkipType.NONE.getKey()); flowParams.hisStatus(TaskStatusEnum.COPY.getStatus()); - flowParams.handler(LoginHelper.getUserIdStr()); flowParams.message("【抄送给】" + StreamUtils.join(wfCopyList, WfCopy::getUserName)); HisTask hisTask = hisTaskService.setSkipHisTask(task, flowNode, flowParams); hisTask.setCreateTime(updateTime); @@ -239,7 +234,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { for (WfCopy wfCopy : wfCopyList) { FlowUser flowUser = new FlowUser(); flowUser.setType(String.valueOf(4)); - flowUser.setProcessedBy(USER.getCode() + wfCopy.getUserId()); + flowUser.setProcessedBy(wfCopy.getUserId()); flowUser.setAssociated(taskId); userList.add(flowUser); }