Merge branch 'music_score_zouxuan' of http://git.dayaedu.com/yonge/mec into mec_update_2021-11-02

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScoreCategories.java

@@ -40,7 +40,7 @@ public class SysMusicScoreCategories {
 
 	private Integer order;
 
-	private Integer musicScoreNum = 0;
+	private Integer musicScoreNum;
 
 	public Integer getMusicScoreNum() {
 		return musicScoreNum;

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

@@ -154,8 +154,13 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 		PageInfo<SysMusicScore> sysMusicScorePageInfo = queryPage(queryInfo);
 		List<SysMusicScore> rows = sysMusicScorePageInfo.getRows();
 		if(rows != null && rows.size() > 0){
+			Set<Integer> categoriesIds = rows.stream().map(e -> e.getMusicScoreCategoriesId()).collect(Collectors.toSet());
+			Map<Integer,String> map = new HashMap<>(categoriesIds.size());
+			for (Integer categoriesId : categoriesIds) {
+				map.put(categoriesId,getParentTreeName(categoriesId));
+			}
 			for (SysMusicScore row : rows) {
-				row.setCategoriesName(getParentTreeName(row.getCategoriesId()));
+				row.setCategoriesName(map.get(row.getMusicScoreCategoriesId()));
 			}
 		}
 		return sysMusicScorePageInfo;