diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java
index 3d9f1842..d467f85d 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java
@@ -52,36 +52,37 @@ public class ApprovalServiceImpl implements ApprovalService {
approval.setStatus(ApprovalStatus.APPROVED.getCode());
//更改审批单状态
approvalInfoMapper.updateApproval(approval);
+ ApprovalRequest approvalRequest = approvalInfoMapper.queryById(approval.getId());
//推送消息给申请人
NewSysNotificationParamsVo newSysNotificationParamsVo = new NewSysNotificationParamsVo();
- String applyContentTemplate="您发布的{}\"{}\"{}审核已通过";
- String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(approval.getType())
- ,getModelNameByType(approval.getContent(),approval.getType()));
+ String applyContentTemplate="您发布的{}\"{}\"审核已通过";
+ String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(approvalRequest.getType())
+ ,getModelNameByType(approvalRequest.getContent(),approvalRequest.getType()));
newSysNotificationParamsVo.setType(2);
- newSysNotificationParamsVo.setSender(approval.getApplicantId());
- newSysNotificationParamsVo.setNotification_url(approval.getUrl());
- newSysNotificationParamsVo.setReceivers(approval.getApproverId().toString());
+ newSysNotificationParamsVo.setSender(approvalRequest.getApplicantId());
+ newSysNotificationParamsVo.setNotification_url(approvalRequest.getUrl());
+ newSysNotificationParamsVo.setReceivers(approvalRequest.getApproverId().toString());
newSysNotificationParamsVo.setContent(appContentFormat);
infoPublishService.pushSysInfo(newSysNotificationParamsVo);
//推送消息给审批人
NewSysNotificationParamsVo approveParamsVo = new NewSysNotificationParamsVo();
- String contentTemplate="{}发布的{}\"{}\"{}审核已通过";
- String contentFormat = StrUtil.format(contentTemplate,approval.getApplicantName(),ApprovalType.getDescription(approval.getType())
- ,getModelNameByType(approval.getContent(),approval.getType()));
+ String contentTemplate="{}发布的{}\"{}\"审核已通过";
+ String contentFormat = StrUtil.format(contentTemplate,approvalRequest.getApplicantName(),ApprovalType.getDescription(approvalRequest.getType())
+ ,getModelNameByType(approvalRequest.getContent(),approvalRequest.getType()));
approveParamsVo.setType(2);
approveParamsVo.setContent(contentFormat);
- approveParamsVo.setSender(approval.getApproverId());
- approveParamsVo.setNotification_url(approval.getUrl());
- approveParamsVo.setReceivers(approval.getApplicantId().toString());
+ approveParamsVo.setSender(approvalRequest.getApproverId());
+ approveParamsVo.setNotification_url(approvalRequest.getUrl());
+ approveParamsVo.setReceivers(approvalRequest.getApplicantId().toString());
infoPublishService.pushSysInfo(newSysNotificationParamsVo);
//审批通过,更改状态
- updateStatus(approval);
+ updateStatus(approvalRequest);
}
@Override