From aba3d17b2c590ccc6a21b2a2e208c1ec18cfc794 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 25 Oct 2023 14:26:11 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=8F=AF?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BEisWasic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml | 8 +++++++-
 .../service/impl/PayMeetingSituationServiceImpl.java      | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
index 25596ea8..fb24ec39 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
@@ -29,11 +29,13 @@
         <result column="director_phone" property="directorPhone"/>
         <result column="hotel_name" property="hotelName"/>
         <result column="hotel_address" property="hotelAddress"/>
-        <result column="hotel_contacts" property="hotelContacts"/>
         <result column="remark" property="remark"/>
         <result column="pay_mode" property="payMode"/>
         <result column="meetingStatus" property="meetingStatus"/>
         <result column="register_check_result" property="registerCheckResult"/>
+        <result column="is_wasic" property="isWasic"/>
+        <result column="link_topics" property="linkTopics"/>
+
     </resultMap>
 
     <!--  将原有id改为会议id, 新增situationId 为成员id  -->
@@ -75,6 +77,8 @@
                         notice,
                         pm.id,
                         pm.create_time as create_time,
+                        pm.is_wasic,
+                        pm.link_topics,
                         GROUP_CONCAT(pms.company_contact_id) company_contact_ids,
                         (case
                                 when start_time > #{now} then 2
@@ -131,6 +135,8 @@
                         pms.id as situationId,
                         pm.id,
                         pm.create_time as create_time,
+                        pm.is_wasic,
+                        pm.link_topics,
                         (case
                                 when start_time > #{now} then 2
                                 when start_time <![CDATA[<=]]> #{now}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 4e73e000..44b58151 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -1171,6 +1171,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 Integer isWasic = payMeeting.getIsWasic();
                 if (PayProjectCommon.YES.equals(isWasic)){
                     String linkTopics = payMeeting.getLinkTopics();
+                    if (StringUtils.isBlank(linkTopics)) {
+                        throw new JeroBootException("课题名称选择错误");
+                    }
                     List<String> linkTopicList = Arrays.asList(linkTopics.split(","));
                     //先判断是否有免费专题
                     String choiceTopic = payMeetingSituation.getChoiceTopic();