Merge branch 'online_dev_20230606'

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

@@ -138,10 +138,12 @@
             </foreach>
         </if>
         <if test="param.subjectIdList != null and param.subjectIdList.size() != 0">
-            and
-            <foreach collection="param.subjectIdList" separator="or" item="item"  open="(" close=")" >
+            and(
+            <foreach collection="param.subjectIdList" separator="or" item="item" open="(" close=")">
                 find_in_set(#{item},t.music_subject_)
             </foreach>
+            or t.music_subject_ is null or t.music_subject_ = ''
+            )
         </if>
         <if test="param.state != null">
             and t.state_ = #{param.state}