fix:website

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -86,7 +86,8 @@
         <if test="param.idAndName != null and param.idAndName != ''">
             and (t.id_ like concat('%',#{param.idAndName},'%') or
             t.music_sheet_name_ like concat('%',#{param.idAndName},'%') or
-            t.composer_ like concat ('%',#{param.idAndName},'%'))
+            t.composer_ like concat ('%',#{param.idAndName},'%') or
+            su.username_ like concat ('%',#{param.idAndName},'%') )
         </if>
         <if test="param.musicTagIds != null and param.musicTagIds != ''">
             and

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/open/OpenMusicAlbumController.java

@@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 专辑表 web 控制层
@@ -80,14 +82,30 @@ public class OpenMusicAlbumController extends BaseController {
         musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES);
         musicAlbumSearch.setSortBy(1);
         musicAlbumSearch.setPage(1);
-        musicAlbumSearch.setRows(4);
+        musicAlbumSearch.setRows(5);
         IPage<MusicAlbumVo> hotMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch);
-        albumDetailVo.setHotMusicAlbum(hotMusicAlbum.getRecords());
+        List<MusicAlbumVo> musicAlbumVos = hotMusicAlbum.getRecords()
+                                                  .stream()
+                                                  .filter(musicAlbumVo -> !musicAlbumVo.getId()
+                                                                                       .equals(albumDetailVo.getId()))
+                                                  .collect(Collectors.toList());
+        if (musicAlbumVos.size() > 4) {
+            musicAlbumVos = musicAlbumVos.subList(0,4);
+        }
+        albumDetailVo.setHotMusicAlbum(musicAlbumVos);
 
         // 相关专辑
         musicAlbumSearch.setAlbumTagIds(albumDetailVo.getAlbumTag());
         IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch);
-        albumDetailVo.setRelatedMusicAlbum(relatedMusicAlbum.getRecords());
+        List<MusicAlbumVo> musicAlbumVos1 = relatedMusicAlbum.getRecords()
+                                                      .stream()
+                                                      .filter(musicAlbumVo -> !musicAlbumVo.getId()
+                                                                                           .equals(albumDetailVo.getId()))
+                                                      .collect(Collectors.toList());
+        if (musicAlbumVos1.size() > 4) {
+            musicAlbumVos1 = musicAlbumVos1.subList(0,4);
+        }
+        albumDetailVo.setRelatedMusicAlbum(musicAlbumVos1);
         return succeed(albumDetailVo);
     }