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

mec-application/src/main/java/com/ym/mec/student/controller/SysMusicScoreController.java

@@ -40,11 +40,11 @@ public class SysMusicScoreController extends BaseController {
         queryInfo.setType("COMMON");
         queryInfo.setClientFlag(true);
         queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
-        if(queryInfo.getSubjectId() == null){
+        if(queryInfo.getSubjectId() == null && !StringUtils.equals(queryInfo.getCategoriesId(),"43")){
             Student student = studentService.get(userId);
             StringBuffer subjectIds = new StringBuffer();
-            if(StringUtils.isNotEmpty(student.getSubjectId())){
-                String[] split = student.getSubjectId().split(",");
+            if(StringUtils.isNotEmpty(student.getSubjectIdList())){
+                String[] split = student.getSubjectIdList().split(",");
                 for (String s : split) {
                     if(subjectIds.length() > 0){
                         subjectIds.append(",");