From cd89073f29fc13d7012f294c6762f6e30cbefa3a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 20 Dec 2021 16:40:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/controller/PayMeetingController.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 8eb7c9a0..4f67643f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -454,12 +454,12 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
     public void download(@PathVariable String id, @PathVariable String meetingId, HttpServletResponse response, String type) {
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String sysUserId = sysUser.getId();
-        PayMeeting byId = payMeetingService.getById(meetingId);
-        if(ObjectUtils.isEmpty(byId)){
+        PayMeeting payMeeting = payMeetingService.getById(meetingId);
+        if(ObjectUtils.isEmpty(payMeeting)){
             throw new JeroBootException("会议不存在..");
         }
-        String meetingMinute = byId.getMeetingMinute();
-        String meetingData = byId.getMeetingData();
+        String meetingMinute = payMeeting.getMeetingMinute();
+        String meetingData = payMeeting.getMeetingData();
         List<String> fileList = new ArrayList<>();
         if(StringUtils.isNotBlank(meetingMinute)) {
             fileList.addAll(Arrays.asList(meetingMinute.split(",")));
@@ -467,10 +467,10 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         if(StringUtils.isNotBlank(meetingData)) {
             fileList.addAll(Arrays.asList(meetingData.split(",")));
         }
-        if(fileList==null||!fileList.contains(id)){
+        if(!fileList.contains(id)){
             throw new JeroBootException("会议无此文件..");
         }
-        BigDecimal meetingCosts = byId.getMeetingCosts();
+        BigDecimal meetingCosts = payMeeting.getMeetingCosts();
         //免费会议
         if (!"0.00".equals(meetingCosts.toString())){
             QueryWrapper<PayMeetingSituation> queryWrapper1 = new QueryWrapper<>();
@@ -555,7 +555,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                 } else {
                     ossFile.setDownloadNumber(downloadNumber + 1);
                 }
-                ossFileService.updateById(ossFile);
+                ossFileService.updateAndPush(ossFile);
             } else {
                 Integer viewNumber = ossFile.getViewNumber();
                 if (viewNumber == null) {