From 20e944ebe307046b1318f3d939ebca22fd86656e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 7 Jan 2022 10:33:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=90=86=E4=BA=8B=E4=BC=9A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/mapper/xml/PayCaseCouncilSubitemMapper.xml   |  2 +-
 .../meeting/service/impl/PayMeetingServiceImpl.java   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
index 3b0b1742..3f732fe6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
@@ -22,7 +22,7 @@
         left join pay_company_management pcm on(pm.company_id=pcm.id)
         <if test=" userId!=null and userId != ''">
             left join pay_meeting pme on (pe.id=pme.council_id)
-            left join pay_meeting_contacts pmc on pm.id = pmc.meeting_id
+            left join pay_meeting_contacts pmc on pme.id = pmc.meeting_id
         </if>
         <where>
             <if test=" contactsNames!=null and contactsNames != ''">
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index 96df4d23..66411089 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -38,6 +38,7 @@ import com.jero.meeting.entity.*;
 import com.jero.meeting.mapper.PayMeetingMapper;
 import com.jero.meeting.service.*;
 import com.jero.meeting.valid.group.CaseCommitteeMeeting;
+import com.jero.meeting.valid.group.CouncilMeeting;
 import com.jero.meeting.valid.group.InternationalMeeting;
 import com.jero.meeting.valid.group.WorkingGroupMeeting;
 import com.jero.meeting.vo.PayMeetingVO;
@@ -421,6 +422,16 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 payMeetingVO.setCaseCommitteeName(payCaseCommittee.getName());
                 payMeetingVO.setRemind(MeetingCommon.REMIND_0);
                 break;
+            case MeetingCommon.COUNCIL_MEETING:
+                ValidUtil.validate(payMeetingVO, CouncilMeeting.class);
+                String councilId = payMeetingVO.getCouncilId();
+                PayCaseCouncil payCaseCouncil = payCaseCouncilService.getById(councilId);
+                if (payCaseCouncil == null) {
+                    throw new JeroBootException("理事会项目不存在");
+                }
+                payMeetingVO.setCouncilName(payCaseCouncil.getName());
+                payMeetingVO.setRemind(MeetingCommon.REMIND_0);
+                break;
             default:
         }
         //校验酒店信息