|  | @@ -1718,7 +1718,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 | 
											
												
													
														|  |                      musicName.setId(record.getId());
 |  |                      musicName.setId(record.getId());
 | 
											
												
													
														|  |                      musicName.setName(record.getMusicSheetName());
 |  |                      musicName.setName(record.getMusicSheetName());
 | 
											
												
													
														|  |                      musicName.setType("MUSIC");
 |  |                      musicName.setType("MUSIC");
 | 
											
												
													
														|  | -                    musicName.setSort(record.getFavoriteCount());
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    musicName.setSort(Optional.ofNullable(record.getFavoriteCount()).orElse(0));
 | 
											
												
													
														|  |                      musicNames.add(musicName);
 |  |                      musicNames.add(musicName);
 | 
											
												
													
														|  |                  }
 |  |                  }
 | 
											
												
													
														|  |                  searchData.setMusic(PageUtil.pageInfo(musicSheetVoIPage));
 |  |                  searchData.setMusic(PageUtil.pageInfo(musicSheetVoIPage));
 | 
											
										
											
												
													
														|  | @@ -1738,7 +1738,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 | 
											
												
													
														|  |                      musicName.setId(record.getId());
 |  |                      musicName.setId(record.getId());
 | 
											
												
													
														|  |                      musicName.setName(record.getAlbumName());
 |  |                      musicName.setName(record.getAlbumName());
 | 
											
												
													
														|  |                      musicName.setType("MUSIC");
 |  |                      musicName.setType("MUSIC");
 | 
											
												
													
														|  | -                    musicName.setSort(record.getAlbumFavoriteCount());
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    musicName.setSort(Optional.ofNullable(record.getAlbumFavoriteCount()).orElse(0));
 | 
											
												
													
														|  |                      musicNames.add(musicName);
 |  |                      musicNames.add(musicName);
 | 
											
												
													
														|  |                  }
 |  |                  }
 | 
											
												
													
														|  |                  searchData.setAlbum(PageUtil.pageInfo(musicAlbumVoIPage));
 |  |                  searchData.setAlbum(PageUtil.pageInfo(musicAlbumVoIPage));
 |