Merge branch 'feature/1123_music' into test

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/MusicSheetController.java

@@ -417,6 +417,7 @@ public class MusicSheetController extends BaseController {
             throw new BizException("用户信息获取失败");
         }
         queryInfo.setUserId(sysUser.getId());
+        queryInfo.setProviderType(SourceTypeEnum.PLATFORM);
         return succeed(musicSheetService.search(queryInfo));
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/music/MusicCompareWrapper.java

@@ -2,10 +2,7 @@ package com.yonge.cooleshow.biz.dal.wrapper.music;
 
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.enums.FeatureType;
-import com.yonge.cooleshow.biz.dal.enums.HeardLevelEnum;
-import com.yonge.cooleshow.biz.dal.enums.MK;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.enums.music.MusicCompareType;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
@@ -380,6 +377,8 @@ public class MusicCompareWrapper {
         @ApiModelProperty("名称 ")
         private String name;
 
+        @ApiModelProperty(value = "提供方 TENANT 机构 PLATFORM 平台")
+        private SourceTypeEnum providerType;
 
         @ApiModelProperty("类型 MUSIC 曲目 ALBUM专辑")
         private String type;

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

@@ -834,6 +834,9 @@
                     </foreach>
                     and tam.del_flag_=0
                 </if>
+                <if test="param.providerType != null">
+                    and t.provider_type_ = #{param.providerType}
+                </if>
             </where>
         order by t.top_flag_ desc, t.sort_number_ desc, t.favorite_count_ desc