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

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

@@ -281,6 +281,10 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             getAllCategoryIdList(categoriesIdList, sysMusicScoreCategories.getSysMusicScoreCategoriesList());
 
             queryInfo.setCategoriesIdList(categoriesIdList);
+        }else {
+            if(queryInfo.getCategoriesId() == null){
+                return new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+            }
         }
         return this.queryPage(queryInfo);
     }