From f769d817f8ba2522147c73fa93ccacdc3aab0cb6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 24 十月 2025 18:15:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
index e3daf29..84a14f5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
+++ b/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;
--
Gitblit v1.7.1