|
@@ -2868,10 +2868,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
PageInfo<MusicGroupCourseScheduleDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
- List<MusicGroupCourseScheduleDto> dataList = null;
|
|
|
+ List<MusicGroupCourseScheduleDto> dataList = new ArrayList<>();
|
|
|
int count = classGroupDao.countMusicGroupCourseScheduleDetail(params);
|
|
|
- if (count > 0) {
|
|
|
- pageInfo.setTotal(count);
|
|
|
+ pageInfo.setTotal(count);
|
|
|
+
|
|
|
+ if (queryInfo.getPage() <= pageInfo.getTotalPage()) {
|
|
|
params.put("offset", pageInfo.getOffset());
|
|
|
dataList = classGroupDao.queryMusicGroupCourseScheduleDetail(params);
|
|
|
//获取当前合奏班班级编号列表
|
|
@@ -2938,9 +2939,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
}*/
|
|
|
}
|
|
|
}
|
|
|
- if (count == 0) {
|
|
|
- dataList = new ArrayList<>();
|
|
|
- }
|
|
|
pageInfo.setRows(dataList);
|
|
|
return pageInfo;
|
|
|
}
|