From 785ad72ba60c54e49bdb2148a6c7e29ffe88493b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 9 Jul 2024 14:23:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=2086988=20=E5=8A=9F=E8=83=BD=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E9=A1=B9=E7=9B=AE=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE--=E5=AF=BC=E5=87=BA=E5=90=8E=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E4=B8=8E=E5=88=97=E8=A1=A8=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/service/impl/PayMeetingSituationServiceImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

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 31fa3394..90be29c2 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
@@ -1191,6 +1191,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             if (!b){
                 throw new JeroBootException("功能安全中心成员才能报名");
             }
+            payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
         }
         //国际研讨会会议的嘉宾和其他类型不同
         if (meetingType.equals(Integer.parseInt(MeetingCommon.INTERNATIONAL_MEETING)) &&
@@ -1732,6 +1733,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (StringUtils.isNotBlank(particularYear)){
             queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
         }
+        queryWrapper.orderByDesc("pms.create_time");
         IPage<PayMeetingSituation> pageListContract = pageListContract(meetingId, new Page<>(-1, -1), queryWrapper,meetingType);
         List<PayMeetingSituation> pageList = pageListContract.getRecords();