From 736dfdf2a42b3e2dda72b62dfd36975780f40477 Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Fri, 17 Dec 2021 15:26:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/data/service/impl/PayCaseCommitteeServiceImpl.java | 1 +
 .../com/jero/meeting/controller/PayMeetingController.java   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java
index 697258c0..0edfb845 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java
@@ -99,6 +99,7 @@ public class PayCaseCommitteeServiceImpl extends ServiceImpl<PayCaseCommitteeMap
         String salt = oConvertUtils.randomGen(8);
         String passwordEncode = PasswordUtil.encrypt(phone,password,salt);
         registerSelf.getPayContactsManagement().setPassword(passwordEncode);
+        registerSelf.getPayContactsManagement().setSalt(salt);
         payContactsManagementService.addMeeting(registerSelf.getPayContactsManagement());
         redisUtil.del("_verification:_phone:" + phone);
     }
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 99d357e3..50b8adcb 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
@@ -459,7 +459,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         }
         String meetingMinute = byId.getMeetingMinute();
         String meetingData = byId.getMeetingData();
-        List<String> fileList = null;
+        List<String> fileList = new ArrayList<>();
         if(StringUtils.isNotBlank(meetingMinute)) {
             fileList.addAll(Arrays.asList(meetingMinute.split(",")));
         }
@@ -471,13 +471,13 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         }
         BigDecimal meetingCosts = byId.getMeetingCosts();
         //免费会议
-        if ("0".equals(meetingCosts.toString())){
+        if (!"0.00".equals(meetingCosts.toString())){
             QueryWrapper<PayMeetingSituation> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("meeting_id", meetingId);
             queryWrapper1.eq("company_contact_id", sysUserId);
             PayMeetingSituation one = payMeetingSituationService.getOne(queryWrapper1);
             if (ObjectUtils.isEmpty(one)) {
-                throw new JeroBootException("会议报名并审核通过后才可查看文件");
+                throw new JeroBootException("未报名会议。");
             }
             Integer checkResult = one.getCheckResult();
             if (checkResult != 1) {