|
@@ -86,7 +86,14 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
|
|
|
musicScoreQueryInfo.setParentId(categoriesId);
|
|
|
List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesService.queryTree(musicScoreQueryInfo);
|
|
|
if(scoreCategories.size() > 0){
|
|
|
- categoriesIdList = scoreCategories.stream().map(e->e.getId()).collect(Collectors.toList());
|
|
|
+ List<SysMusicScoreCategories> allScoreCategories = new ArrayList<>();
|
|
|
+ allScoreCategories.addAll(scoreCategories);
|
|
|
+ for (SysMusicScoreCategories scoreCategory : scoreCategories) {
|
|
|
+ if(scoreCategory.getSysMusicScoreCategoriesList() != null){
|
|
|
+ allScoreCategories.addAll(scoreCategory.getSysMusicScoreCategoriesList());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ categoriesIdList = allScoreCategories.stream().map(e->e.getId()).collect(Collectors.toList());
|
|
|
}else {
|
|
|
categoriesIdList.add(categoriesId);
|
|
|
}
|