Merge branch 'zx_saas_cbs_category' of http://git.dayaedu.com/yonge/mec into test

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

@@ -52,7 +52,7 @@ public class SysMusicScoreCategoriesController extends BaseController {
         SysUser sysUser = sysUserService.getUser();
         String teachingMaterialIds = organizationService.getTeachingMaterialIds(sysUser.getOrganId().toString(),sysUser.getTenantId());
         if(teachingMaterialIds.contains(queryInfo.getParentId().toString())){
-            return succeed(cbsMusicScoreCategoriesService.queryTree(queryInfo));
+            return succeed(cbsMusicScoreCategoriesService.queryTreeByAppId());
         }
         return succeed();
     }

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

@@ -149,7 +149,7 @@
 		LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,sms.subject_ids_)
 		WHERE sms.del_flag_ = 0 AND sms.cbs_music_sheet_id_ IS NOT NULL AND s.id_ IS NOT NULL AND sms.music_sheet_type_ = 'SINGLE'
 		<if test="categoriesIdList != null and categoriesIdList.size > 0">
-			AND ses.cbs_music_categories_id_ IN
+			AND sms.cbs_music_categories_id_ IN
 			<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">
 				#{item}
 			</foreach>