教学伴奏支持不选择声部

mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -173,7 +173,7 @@
     <select id="querySubjectIds" resultMap="com.ym.mec.biz.dal.dao.SubjectDao.Subject">
 		SELECT s.* FROM sys_music_score_accompaniment sesa
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
-		WHERE sesa.del_flag_ = 0
+		WHERE sesa.del_flag_ = 0 AND sesa.subject_id_ IS NOT NULL
 		GROUP BY sesa.subject_id_
 	</select>
 
@@ -196,7 +196,7 @@
 				AND sesc.parent_id_ = #{parentId}
 			</if>
 			<if test="subjectId != null">
-				AND sesa.subject_id_ = #{subjectId}
+				AND (sesa.subject_id_ = #{subjectId} OR sesa.subject_id_ IS NULL)
 			</if>
 			<if test="isShowFingering != null">
 				AND sesa.is_show_fingering_ = #{isShowFingering}