Merge branch 'ljc_website'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetVo.java

@@ -29,9 +29,20 @@ public class MusicSheetVo extends MusicSheet {
     @ApiModelProperty("收藏 0：否，1：是")
     private YesOrNoEnum favorite;
 
+    @ApiModelProperty("收藏人数")
+    private Long favoriteCount;
+
     @ApiModelProperty("是否购买/VIP（0：否，1：是） ")
     private YesOrNoEnum play;
 
+    public Long getFavoriteCount() {
+        return favoriteCount;
+    }
+
+    public void setFavoriteCount(Long favoriteCount) {
+        this.favoriteCount = favoriteCount;
+    }
+
     public String getAddName() {
         return addName;
     }

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

@@ -253,6 +253,9 @@
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
+        ,(select count(1) as num from music_favorite af
+                left join sys_user su on af.user_id_ = su.id_
+                where su.del_flag_ = 0 and af.music_sheet_id_ = t.id_) as favoriteCount
         ,(select group_concat(s.name_) from subject s
         where find_in_set(s.id_,t.music_subject_)  and s.del_flag_ = 0) as subjectNames
         <if test="param.studentId != null">