Merge remote-tracking branch 'origin/master'

mitao

2 天以前 f769d817f8ba2522147c73fa93ccacdc3aab0cb6

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java

@@ -783,7 +783,7 @@
        res.setApplicationReason(approvalApplicationsBack.getApplicationReason());
        res.setAttachmentUrl(approvalApplicationsBack.getAttachmentUrl());
        res.setOperateTime(approvalApplicationAssetBack.getOperateTime());
        res.setExpectReturnDate(approvalApplicationAssetBack.getExpectReturnDate());
        res.setExpectReturnDate(approvalApplicationAssetBack.getOperateTime());
        res.setTitle(approvalApplicationAssetBack.getTitle());
        res.setApplicationCode(approvalApplications.getApplicationCode());
        res.setIsAudit(extracted(id, approvalApplications));
@@ -1077,6 +1077,7 @@
        if (sysUser!=null){
            approvalFlowNodeListVO.setUserName(sysUser.getNickName());
        }
        approvalFlowNodeListVO.setSignFlag(false);
        approvalFlowNodeListVOS.add(approvalFlowNodeListVO);
        for (OaApprovalFlowNode approvalFlowNode : approvalFlowNodes) {
            ApprovalFlowNodeListVO approvalFlowNodeVO = new ApprovalFlowNodeListVO();
@@ -1093,6 +1094,7 @@
            }else{
                approvalFlowNodeVO.setFlowName(approvalFlowNode.getFlowName());
            }
            approvalFlowNodeVO.setSignFlag(approvalFlowNode.getSignFlag());
            approvalFlowNodeListVOS.add(approvalFlowNodeVO);
        }
        return approvalFlowNodeListVOS;