|
@@ -38,8 +38,8 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
|
|
|
List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
|
|
|
List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
|
|
|
for (SysMusicScoreCategories categories : scoreCategories) {
|
|
|
- getTree(categories, scoreCategoriesAllList);
|
|
|
- categories.setMusicScoreNum(categories.getMusicScoreNumSum());
|
|
|
+ int sum = getTree(categories, scoreCategoriesAllList);
|
|
|
+ categories.setMusicScoreNum(sum + categories.getMusicScoreNumSum());
|
|
|
}
|
|
|
return scoreCategories;
|
|
|
}
|
|
@@ -224,21 +224,23 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
|
|
|
return categories;
|
|
|
}
|
|
|
|
|
|
- private SysMusicScoreCategories getTree(SysMusicScoreCategories categories,List<SysMusicScoreCategories> scoreCategoriesAllList){
|
|
|
+ private int getTree(SysMusicScoreCategories categories,List<SysMusicScoreCategories> scoreCategoriesAllList){
|
|
|
//得到根节点对象
|
|
|
//获取子节点list
|
|
|
List<SysMusicScoreCategories> scoreCategories = scoreCategoriesAllList.stream().filter(e->e.getParentId().equals(categories.getId())).collect(Collectors.toList());
|
|
|
//如果存在子节点
|
|
|
+ int item = 0;
|
|
|
if(scoreCategories != null && scoreCategories.size() > 0) {
|
|
|
//将子节点list放入父节点对象
|
|
|
categories.setSysMusicScoreCategoriesList(scoreCategories);
|
|
|
//遍历子节点....
|
|
|
for (SysMusicScoreCategories score : scoreCategories) {
|
|
|
- getTree(score, scoreCategoriesAllList);
|
|
|
- score.setMusicScoreNum(score.getMusicScoreNumSum());
|
|
|
+ int sum = getTree(score, scoreCategoriesAllList);
|
|
|
+ score.setMusicScoreNum(sum + score.getMusicScoreNumSum());
|
|
|
+ item += score.getMusicScoreNum();
|
|
|
}
|
|
|
}
|
|
|
- return categories;
|
|
|
+ return item;
|
|
|
}
|
|
|
|
|
|
private SysMusicScoreCategories getChildTree(SysMusicScoreCategories sysMusicScoreCategories){
|