Merge branch 'fix/0411' into develop-new

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

@@ -33,7 +33,7 @@
         <where>
             m.state_ = true and m.del_flag_ = 0 and t.del_flag_ = 0
             <if test="param.musicTagId != null ">
-                and find_in_set(#{param.musicTagId},m.music_subject_)
+                and (find_in_set(#{param.musicTagId},m.music_subject_) or m.music_subject_ is null or m.music_subject_ = '')
             </if>
             <if test="param.subjectId != null" >
                 and find_in_set(#{param.subjectId},m.music_subject_)