From d3d48fb343216b2ba2afa23dffec332a2ef0770d Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Tue, 14 Jun 2022 11:36:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/impl/OaFormReportRouteServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java index 24c73e15..4bfa67be 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java @@ -265,7 +265,7 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements LOG.debug("发起流程，查询第一个用户任务"); UserTask firstUserTask = activitiModelService.getFirstUserTaskByProcessDefinitionId(processDefinitionId); LOG.debug("发起流程，查询第一个用户任务后直连用户任务列表"); - List confirmAssigneeVOs = listConfirmAssignee(currentUserId, deploymentId, firstUserTask); + List confirmAssigneeVOs = listConfirmAssignee(null, currentUserId, deploymentId, firstUserTask); model.put("confirmAssignees", JSON.toJSONString(confirmAssigneeVOs)); setPageFields(deploymentId, firstUserTask, model); @@ -301,7 +301,7 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements model.put("processInstanceId", task.getProcessInstanceId()); model.put("isNeedClaim", isNeedClaim); LOG.debug("查询下一个用户任务后直连用户任务列表"); - List confirmAssigneeVOs = listConfirmAssignee(currentUserId, deploymentId, currentUserTask); + List confirmAssigneeVOs = listConfirmAssignee(task.getProcessInstanceId(), currentUserId, deploymentId, currentUserTask); model.put("confirmAssignees", JSON.toJSONString(confirmAssigneeVOs)); setPageFields(deploymentId, currentUserTask, model); @@ -403,7 +403,7 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements * @param currentUserTask * @return */ - private List listConfirmAssignee(String currentUserId, String deploymentId, UserTask currentUserTask) { + private List listConfirmAssignee(String processInstanceId, String currentUserId, String deploymentId, UserTask currentUserTask) { LOG.debug("1.获取后续任务节点"); List nextUserTasks = activitiModelService.listNextUserTasksByUserTask(currentUserTask); clearUserTask(nextUserTasks); @@ -433,7 +433,12 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements // 设置节点类型 confirmAssigneeVO.setNodeType(oaNodeAssigneePO.getNodeType()); // 设置节点代理人列表 - List assigneeList = nodeAssigneeService.listAssigneeUserId(currentUserId, oaNodeAssigneePO); + List assigneeList; + if (StringUtils.isBlank(processInstanceId)) { + assigneeList = nodeAssigneeService.listAssigneeUserId(currentUserId, oaNodeAssigneePO); + } else { + assigneeList = nodeAssigneeService.listAssigneeUserId(processInstanceId, currentUserId, oaNodeAssigneePO); + } List userDTOs = userBaseService.listByUserIds(assigneeList); List assigneeVOs = userDTOs.stream().map(userDTO -> { ConfirmAssigneeVO.AssigneeVO assigneeVO = new ConfirmAssigneeVO.AssigneeVO();