Merge branch 'feature/1108_audio' into develop-new

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

@@ -192,7 +192,7 @@ public class MusicSheetController extends BaseController {
     @ApiOperation(value = "曲目收藏/取消收藏")
     public HttpResponseResult<Boolean> favorite(@ApiParam(value = "曲目编号", required = true) @PathVariable("id") Long id,
                                                 @ApiParam(value = "客户端类型") @RequestParam(value = "clientType", required = false, defaultValue = "TEACHER") String clientType,
-                                                @RequestParam("providerType") String providerType) {
+                                                @RequestParam(value = "providerType", required = false, defaultValue = "PLATFORM") String providerType) {
         SysUser sysUser = sysUserService.getUser();
         if (ClientEnum.invalid(clientType)) {
             return failed("无效的客户端类型");

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

@@ -1449,7 +1449,7 @@
         </where>
         ) t
         <if test="param.recentFlag != null and param.recentFlag == 1">
-            left join sys_music_compare_record msar on t.id_ = msar.music_sheet_id_ and t.provider_type_ = #{param.providerType}
+            left join sys_music_compare_record msar on t.id_ = msar.music_sheet_id_ and msar.provider_type_ = #{param.providerType}
         </if>
         <if test="param.albumId != null and param.providerType.code == 'TENANT'">
             left join tenant_album_music tam on t.id_ = tam.music_sheet_id_ and tam.del_flag_ = 0  and tam.tenant_album_id_ = #{param.albumId}
@@ -1459,7 +1459,7 @@
             left join album_music_relate amr on t.id_ = amr.music_sheet_id_ and amr.album_id_ = #{param.albumId}
         </if>
         <if test="param.favoriteFlag != null and param.favoriteFlag == 1">
-            left join music_favorite mf on t.id_ = mf.music_sheet_id_ and mf.user_id_ = #{param.userId} and mf.client_type_ = #{param.clientType} and t.provider_type_ = #{param.providerType}
+            left join music_favorite mf on t.id_ = mf.music_sheet_id_ and mf.user_id_ = #{param.userId} and mf.client_type_ = #{param.clientType} and mf.provider_type_ = #{param.providerType}
         </if>
         <where>