Merge branch 'zx_saas_subject_1022' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -312,10 +312,10 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         this.initCategoryIds(queryInfo);
         if(queryInfo.getSubjectId() != null){
             if(queryInfo.getSubjectId() == 5){
-                queryInfo.setSubjectId(6);
+                queryInfo.setSubjectId(null);
                 queryInfo.setSubjectIds("6");
             }else if(queryInfo.getSubjectId() == 122){
-                queryInfo.setSubjectId(122);
+                queryInfo.setSubjectId(null);
                 queryInfo.setSubjectIds("122,121,113,23");
             }else {
                 queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());