bug: 78295内外部会议会议议题顺序按照议题名称排序

2023-11-14 14:25:59 +08:00
parent 097d6652ce
commit bf5d364791
2 changed files with 5 additions and 2 deletions
@@ -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);
        }
@@ -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}