Merge branch 'fix/0529-album_music' into test

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

@@ -104,7 +104,7 @@
         from music_sheet t
         left join sys_user su on t.create_by_ = su.id_
         <if test="param.sortByAlbumIdDesc != null">
-            left join tenant_album_music tam on tam.music_sheet_id_ = t.id_
+            left join tenant_album_music tam on tam.music_sheet_id_ = t.id_ and tam.tenant_album_id_ = #{param.sortByAlbumIdDesc} and tam.del_flag_=0
         </if>
         <where>
             su.del_flag_ = 0