From f16bc258871632947b87f4b9a5ee8ba08c6e9280 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 23 Dec 2021 16:53:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E6=9F=A5=E8=AF=A2sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/mapper/xml/PayMeetingMapper.xml   | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

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 56f575c9..a84392ae 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
@@ -161,10 +161,8 @@
                             check_in
                      FROM pay_meeting pm
                                   LEFT JOIN pay_meeting_situation pms ON pm.id = pms.meeting_id
-                                  LEFT JOIN pay_meeting_remind_record pmrr ON pm.id = pmrr.meeting_id
                      WHERE pms.company_contact_id = #{contactId}
                         OR pms.post_contact_id = #{contactId}
-                        OR pmrr.contact_id = #{contactId}
                      UNION
                      SELECT pm.*,
                             NULL AS situationId,
@@ -179,10 +177,27 @@
                         and pm.id not in (SELECT pm.id
                                     FROM pay_meeting pm
                                     LEFT JOIN pay_meeting_situation pms ON pm.id = pms.meeting_id
-                                    LEFT JOIN pay_meeting_remind_record pmrr ON pm.id = pmrr.meeting_id
                                     WHERE pms.company_contact_id = #{contactId}
                                     OR pms.post_contact_id = #{contactId}
-                                    OR pmrr.contact_id = #{contactId})
+                        )
+                    UNION
+                    SELECT
+                        pm.*,
+                        null situationId,
+                        null payment_record,
+                        null register_check_result,
+                        null check_result,
+                        null check_in
+                    FROM
+                    pay_meeting pm
+                    LEFT JOIN pay_meeting_remind_record pmrr ON pm.id = pmrr.meeting_id
+                    WHERE pmrr.contact_id = #{contactId}
+                        and pm.id not in (SELECT pm.id
+                        FROM pay_meeting pm
+                        LEFT JOIN pay_meeting_situation pms ON pm.id = pms.meeting_id
+                        WHERE pms.company_contact_id = #{contactId}
+                        OR pms.post_contact_id = #{contactId}
+                        )
                      ) result
                 ${ew.customSqlSegment}
     </select>