|
@@ -61,7 +61,19 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
|
|
|
|
|
|
@Override
|
|
|
public List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo) {
|
|
|
- Map<String, Object> params = new HashMap<String, Object>();
|
|
|
+ if(queryInfo.getCategoriesId() != null){
|
|
|
+ List<Integer> categoriesIdList = new ArrayList<>();
|
|
|
+ MusicScoreQueryInfo musicScoreQueryInfo = new MusicScoreQueryInfo();
|
|
|
+ musicScoreQueryInfo.setParentId(queryInfo.getCategoriesId());
|
|
|
+ List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesService.queryTree(musicScoreQueryInfo);
|
|
|
+ if(scoreCategories.size() > 0){
|
|
|
+ categoriesIdList = scoreCategories.stream().map(e->e.getId()).collect(Collectors.toList());
|
|
|
+ }else {
|
|
|
+ categoriesIdList.add(queryInfo.getCategoriesId());
|
|
|
+ }
|
|
|
+ queryInfo.setCategoriesIdList(categoriesIdList);
|
|
|
+ }
|
|
|
+ Map<String, Object> params = new HashMap<>();
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
return sysMusicScoreAccompanimentDao.queryAccPage(params);
|
|
|
}
|