| 
														
															@@ -87,7 +87,7 @@ public class MusicSheetController extends BaseController { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @ApiOperation(value = "乐谱(专辑和曲目同时查询)分页查询", httpMethod="POST", consumes="application/json", produces="application/json") 
														 | 
														
														 | 
														
															     @ApiOperation(value = "乐谱(专辑和曲目同时查询)分页查询", httpMethod="POST", consumes="application/json", produces="application/json") 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @PostMapping(value="/albumAndSheetList", consumes="application/json", produces="application/json") 
														 | 
														
														 | 
														
															     @PostMapping(value="/albumAndSheetList", consumes="application/json", produces="application/json") 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    public HttpResponseResult<AlbumAndSheetVo> albumAndSheetlist(@RequestBody StudentMusicSheetSearch query) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    public HttpResponseResult<AlbumAndSheetVo> albumAndSheetList(@RequestBody StudentMusicSheetSearch query) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         SysUser sysUser = sysUserFeignService.queryUserInfo(); 
														 | 
														
														 | 
														
															         SysUser sysUser = sysUserFeignService.queryUserInfo(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (sysUser == null  || sysUser.getId() == null) { 
														 | 
														
														 | 
														
															         if (sysUser == null  || sysUser.getId() == null) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             return failed("用户信息获取失败"); 
														 | 
														
														 | 
														
															             return failed("用户信息获取失败"); 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -106,6 +106,7 @@ public class MusicSheetController extends BaseController { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch(); 
														 | 
														
														 | 
														
															         MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES); 
														 | 
														
														 | 
														
															         musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         musicAlbumSearch.setSortBy(1); 
														 | 
														
														 | 
														
															         musicAlbumSearch.setSortBy(1); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        musicAlbumSearch.setIdAndName(query.getIdAndName()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         musicAlbumSearch.setAuditVersion(appAuditVersion); 
														 | 
														
														 | 
														
															         musicAlbumSearch.setAuditVersion(appAuditVersion); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         musicAlbumSearch.setAlbumTagIds(query.getMusicTagIds()); 
														 | 
														
														 | 
														
															         musicAlbumSearch.setAlbumTagIds(query.getMusicTagIds()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         musicAlbumSearch.setPage(query.getPage()); 
														 | 
														
														 | 
														
															         musicAlbumSearch.setPage(query.getPage()); 
														 |