|
@@ -133,12 +133,17 @@ public class MusicSheetController extends BaseController {
|
|
|
} else {
|
|
|
pageSize = musicSheetDto.getPageSize();
|
|
|
}
|
|
|
-
|
|
|
+ String search;
|
|
|
+ if(musicSheetDto.getSearch()==null){
|
|
|
+ search = "";
|
|
|
+ } else {
|
|
|
+ search = musicSheetDto.getSearch();
|
|
|
+ }
|
|
|
LambdaQueryWrapper<MusicSheet> lambdaQueryWrapper = Wrappers.lambdaQuery();
|
|
|
- lambdaQueryWrapper.or().like(MusicSheet::getMusicSheetName , musicSheetDto.getSearch());
|
|
|
- lambdaQueryWrapper.or().like(MusicSheet::getComposer , musicSheetDto.getSearch());
|
|
|
- lambdaQueryWrapper.or().like(MusicSheet::getMusicTag , musicSheetDto.getSearch());
|
|
|
- lambdaQueryWrapper.or().like(MusicSheet::getMusicSubject , musicSheetDto.getSearch());
|
|
|
+ lambdaQueryWrapper.or().like(MusicSheet::getMusicSheetName , search);
|
|
|
+ lambdaQueryWrapper.or().like(MusicSheet::getComposer , search);
|
|
|
+ lambdaQueryWrapper.or().like(MusicSheet::getMusicTag , search);
|
|
|
+ lambdaQueryWrapper.or().like(MusicSheet::getMusicSubject , search);
|
|
|
|
|
|
Page<MusicSheet> page = new Page<>(pageNo,pageSize);
|
|
|
return succeed(musicSheetService.page(page, lambdaQueryWrapper));
|