From bf5d3647918b4fac95507355e475d444a6e56008 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 14 Nov 2023 14:25:59 +0800
Subject: [PATCH] =?UTF-8?q?bug:=2078295=E5=86=85=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E4=BC=9A=E8=AE=AE=E8=AE=AE=E9=A2=98=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E6=8C=89=E7=85=A7=E8=AE=AE=E9=A2=98=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InsideOutsideMeetingServiceImpl.java       | 1 +
 .../mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml    | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
index 04138117..f2b90b2b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
@@ -81,6 +81,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
             // 获取会议课题列表
             LambdaQueryWrapper<MeetingTopic> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(MeetingTopic::getMeetingId, meetingId);
+            wrapper.orderByAsc(MeetingTopic::getAgendaName);
             List<MeetingTopic> meetingTopicList = meetingTopicService.list(wrapper);
             insideOutsideMeeting.setMeetingTopicList(meetingTopicList);
         }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
index 3282f204..0d663ed3 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
@@ -103,10 +103,12 @@
         order by
         <choose>
             <when test="sortField == 'AGENDA_NAME'">
-                mt.${sortField} ${sortMode}
+                mt.${sortField} ${sortMode},
+                mt.AGENDA_NAME asc
             </when>
             <otherwise>
-                iom.${sortField} ${sortMode}
+                iom.${sortField} ${sortMode},
+                mt.AGENDA_NAME asc
             </otherwise>
         </choose>
         limit ${pager.startIndex-1},${pageSize}