mitao
2 天以前 9c76b7efccd70395231b032a193a89f7638b657e
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
@@ -1067,6 +1067,8 @@
    }
    private List<ApprovalFlowNodeListVO> getFlowNodeList(SysUser sysUser, List<OaApprovalFlowAudit> approvalFlowAudits
    ,List<OaApprovalFlowNode> approvalFlowNodes) {
        Map<Long, String> userMap = sysUserService.selectAllList().stream()
                .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
        List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS = new ArrayList<>();
        Map<Integer, OaApprovalFlowAudit> approvalFlowAuditMap = approvalFlowAudits.stream().collect(Collectors.toMap(OaApprovalFlowAudit::getFlowNodeId, e -> e));
@@ -1082,7 +1084,10 @@
            OaApprovalFlowAudit approvalFlowAudit = approvalFlowAuditMap.get(approvalFlowNode.getId());
            if (approvalFlowAudit!=null){
                approvalFlowNodeVO.setFlowName(approvalFlowAudit.getFlowName());
                approvalFlowNodeVO.setUserName(approvalFlowAudit.getUserName());
                String s = userMap.get(approvalFlowAudit.getUserId().longValue());
                if (s!=null){
                    approvalFlowNodeVO.setUserName(s);
                }
                approvalFlowNodeVO.setSignPicUrl(approvalFlowAudit.getSignPicUrl());
                approvalFlowNodeVO.setApprovalStatus(approvalFlowAudit.getApprovalStatus());
            }else{