From 6bf96c712d1df685f96b3f2dae23c0b1f8aa3a82 Mon Sep 17 00:00:00 2001
From: ddmte32 <dmmte32>
Date: Fri, 5 Sep 2025 16:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8A=9F=E8=83=BD=E8=81=94?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ApprovalServiceImpl.java     | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

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="<b>您</b>发布的{}<b>\"{}\"</b>{}审核已通过";
-        String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(approval.getType())
-                ,getModelNameByType(approval.getContent(),approval.getType()));
+        String applyContentTemplate="<b>您</b>发布的{}<b>\"{}\"</b>审核已通过";
+        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="<b>{}</b>发布的{}<b>\"{}\"</b>{}审核已通过";
-        String contentFormat = StrUtil.format(contentTemplate,approval.getApplicantName(),ApprovalType.getDescription(approval.getType())
-                ,getModelNameByType(approval.getContent(),approval.getType()));
+        String contentTemplate="<b>{}</b>发布的{}<b>\"{}\"</b>审核已通过";
+        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