|
@@ -186,6 +186,10 @@ public class XgStudentMsgServiceImpl implements IXgStudentMsgService {
|
|
|
.map(String::valueOf)
|
|
.map(String::valueOf)
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
+ // 关闭 PageQuery 的默认排序(create_time desc),避免与 XML 中的 ORDER BY 冲突
|
|
|
|
|
+ // 保证最终排序规则严格按照 Mapper XML 中的
|
|
|
|
|
+ // ORDER BY student_no DESC, create_time DESC 执行
|
|
|
|
|
+ pageQuery.disableDefaultOrder();
|
|
|
Page<XgStudentMsgVo> result = baseMapper.selectPageByDeptIds(pageQuery.build(), lqw, classIdList);
|
|
Page<XgStudentMsgVo> result = baseMapper.selectPageByDeptIds(pageQuery.build(), lqw, classIdList);
|
|
|
return TableDataInfo.build(result);
|
|
return TableDataInfo.build(result);
|
|
|
}
|
|
}
|
|
@@ -726,7 +730,9 @@ public class XgStudentMsgServiceImpl implements IXgStudentMsgService {
|
|
|
List<String> classIdList = filteredDeptIds.stream()
|
|
List<String> classIdList = filteredDeptIds.stream()
|
|
|
.map(String::valueOf)
|
|
.map(String::valueOf)
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
-
|
|
|
|
|
|
|
+ // 保证最终排序规则严格按照 Mapper XML 中的
|
|
|
|
|
+ // ORDER BY student_no DESC, create_time DESC 执行
|
|
|
|
|
+ // pageQuery.disableDefaultOrder();
|
|
|
Page<XgStudentMsgVo> result = baseMapper.selectPageByDeptIds(
|
|
Page<XgStudentMsgVo> result = baseMapper.selectPageByDeptIds(
|
|
|
new Page<>(bo.getPageNum(), bo.getPageSize()), lqw, classIdList);
|
|
new Page<>(bo.getPageNum(), bo.getPageSize()), lqw, classIdList);
|
|
|
return TableDataInfo.build(result);
|
|
return TableDataInfo.build(result);
|