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 @@ - + + + @@ -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 #{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 linkTopicList = Arrays.asList(linkTopics.split(",")); //先判断是否有免费专题 String choiceTopic = payMeetingSituation.getChoiceTopic();