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

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

@@ -90,6 +90,9 @@ public class SysMusicScoreCategoriesController extends BaseController {
         }else if ("TENANT".equals(queryType)) {
             SysUser user = sysUserService.getUser();
             TenantConfig tenantConfig = tenantConfigService.getOne(new QueryWrapper<TenantConfig>().eq("tenant_id_", user.getTenantId()));
+            if(tenantConfig == null){
+                return succeed(cbsMusicScoreCategoriesService.queryTreeByAppId());
+            }
             return succeed(cbsMusicScoreCategoriesService.queryCategoriesTreeList(tenantConfig.getTeachingMaterialId(),false));
         }
         SysUser user = sysUserService.getUser();