|
@@ -90,6 +90,7 @@ public class MusicSheetController extends BaseController {
|
|
|
query.setState(YesOrNoEnum.YES);
|
|
|
query.setAuditStatus(AuthStatusEnum.PASS);
|
|
|
query.setStudentId(sysUser.getId());
|
|
|
+ query.setRows(query.getSheetRow());
|
|
|
IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query);
|
|
|
|
|
|
MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch();
|
|
@@ -97,7 +98,7 @@ public class MusicSheetController extends BaseController {
|
|
|
musicAlbumSearch.setSortBy(1);
|
|
|
musicAlbumSearch.setAlbumTagIds(query.getMusicTagIds());
|
|
|
musicAlbumSearch.setPage(query.getPage());
|
|
|
- musicAlbumSearch.setRows(query.getRows());
|
|
|
+ musicAlbumSearch.setRows(query.getAlbumRow());
|
|
|
IPage<MusicAlbumVo> musicAlbumVoIPage = musicAlbumService.selectPage(PageUtil.getPage(query), musicAlbumSearch);
|
|
|
|
|
|
AlbumAndSheetVo albumAndSheetVo = new AlbumAndSheetVo();
|