Merge branch 'website_1_1_20220802'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -844,6 +844,12 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         musicSheetSearch.setPage(1);
         musicSheetSearch.setRows(5);
         List<MusicSheetVo> musicSheetVos = baseMapper.selectPage(PageUtil.getPage(musicSheetSearch), musicSheetSearch);
+        musicSheetVos = musicSheetVos .stream() .filter(musicAlbumVo -> !musicAlbumVo.getId()
+                                                              .equals(musicSheetId))
+                                                             .collect(Collectors.toList());
+        if (musicSheetVos.size() > 4) {
+            musicSheetVos = musicSheetVos.subList(0,4);
+        }
         teacherMusicSheetListVo.setMusicSheetList(musicSheetVos);
 
         musicSheetWebsiteDetailVo.setTeacher(teacherMusicSheetListVo);