FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wxyclub
2023-11-14 14:25:59 +08:00
parent 097d6652ce
commit bf5d364791
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
+1
View File
@@ -81,6 +81,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
// 获取会议课题列表 // 获取会议课题列表
LambdaQueryWrapper<MeetingTopic> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<MeetingTopic> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(MeetingTopic::getMeetingId, meetingId); wrapper.eq(MeetingTopic::getMeetingId, meetingId);
wrapper.orderByAsc(MeetingTopic::getAgendaName);
List<MeetingTopic> meetingTopicList = meetingTopicService.list(wrapper); List<MeetingTopic> meetingTopicList = meetingTopicService.list(wrapper);
insideOutsideMeeting.setMeetingTopicList(meetingTopicList); insideOutsideMeeting.setMeetingTopicList(meetingTopicList);
} }
adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
+4 -2
View File
@@ -103,10 +103,12 @@
order by order by
<choose> <choose>
<when test="sortField == 'AGENDA_NAME'"> <when test="sortField == 'AGENDA_NAME'">
mt.${sortField} ${sortMode} mt.${sortField} ${sortMode},
mt.AGENDA_NAME asc
</when> </when>
<otherwise> <otherwise>
iom.${sortField} ${sortMode} iom.${sortField} ${sortMode},
mt.AGENDA_NAME asc
</otherwise> </otherwise>
</choose> </choose>
limit ${pager.startIndex-1},${pageSize} limit ${pager.startIndex-1},${pageSize}