|
@@ -71,10 +71,11 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
|
|
public IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> selectPage(IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page, TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query) {
|
|
public IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> selectPage(IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page, TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query) {
|
|
List<Long> albumIds = query.getAlbumIds();
|
|
List<Long> albumIds = query.getAlbumIds();
|
|
SubjectTypeEnum subjectType = query.getSubjectType();
|
|
SubjectTypeEnum subjectType = query.getSubjectType();
|
|
|
|
+ String s = subjectType.toString();
|
|
String type = query.getType();
|
|
String type = query.getType();
|
|
String level = query.getLevel();
|
|
String level = query.getLevel();
|
|
|
|
|
|
- List<Long> musicSheetIds = tenantAlbumMusicMapper.selectMusicSheetIds(albumIds, subjectType, type, level);
|
|
|
|
|
|
+ List<Long> musicSheetIds = tenantAlbumMusicMapper.selectMusicSheetIds(albumIds, s, type, level);
|
|
|
|
|
|
TenantAlbumMusicWrapper.StudentMusicSheetQuery musicSheetQuery = new TenantAlbumMusicWrapper.StudentMusicSheetQuery();
|
|
TenantAlbumMusicWrapper.StudentMusicSheetQuery musicSheetQuery = new TenantAlbumMusicWrapper.StudentMusicSheetQuery();
|
|
musicSheetQuery.setMusicSheetIds(musicSheetIds);
|
|
musicSheetQuery.setMusicSheetIds(musicSheetIds);
|
|
@@ -83,8 +84,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
|
|
List<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> musicSheets = tenantAlbumMusicMapper.selectPage(page, musicSheetQuery);
|
|
List<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> musicSheets = tenantAlbumMusicMapper.selectPage(page, musicSheetQuery);
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
- return page.setRecords(baseMapper.selectPage(page, musicSheetQuery));
|
|
|
|
|
|
+ return page.setRecords(musicSheets);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|