去掉曲目分类

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -297,11 +297,10 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
     public PageInfo<SysMusicScore> queryMusicScorePageInfo(SysExamSongQueryInfo queryInfo) {
         this.initCategoryIds(queryInfo);
         if(queryInfo.getSubjectId() != null){
-            queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());
             if(queryInfo.getSubjectId() == 5){
-                queryInfo.setSubjectIds(queryInfo.getSubjectIds() + ",6");
-            }else if (queryInfo.getSubjectId() == 6){
-                queryInfo.setSubjectIds(queryInfo.getSubjectIds() + ",5");
+                queryInfo.setSubjectIds("6");
+            }else {
+                queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());
             }
         }
         if(CollectionUtils.isEmpty(queryInfo.getCategoriesIdList())){

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

@@ -286,7 +286,7 @@
 				AND (FIND_IN_SET(#{subjectId},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.is_all_subject_)
 			</if>
 			<if test="subjectIds != null and subjectIds != ''">
-				AND (INTE_ARRAY(#{subjectIds},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.is_all_subject_)
+				AND (FIND_IN_SET(#{subjectIds},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.is_all_subject_)
 			</if>
 			<if test="clientType != null">
 				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}