管乐迷曲目来源内容平台

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

@@ -157,8 +157,12 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                 Map<Integer,CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryMap = musicalInstrumentQueryDtos.stream()
                         .collect(Collectors.toMap(CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto::getId, o -> o, (o1, o2) -> o1));
                 //获取分类名称
-                List<SysMusicScoreCategories> sysMusicScoreCategories = sysMusicScoreCategoriesDao.queryByIds(categoriesIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
-                Map<Integer, SysMusicScoreCategories> categoriesMap = sysMusicScoreCategories.stream().collect(Collectors.toMap(SysMusicScoreCategories::getId, Function.identity()));
+                Map<Integer, String> categoriesMap = new HashMap<>(categoriesIds.size());
+                for (Integer categoriesId : categoriesIds) {
+                    if(null != categoriesId){
+                        categoriesMap.put(categoriesId, getParentTreeName(categoriesId));
+                    }
+                }
                 for (SysMusicScore record : records) {
                     record.setCategoriesName(map.get(record.getMusicScoreCategoriesId()));
                     record.setOrganName(organMap.get(record.getMusicScoreCategoriesId()));
@@ -172,7 +176,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
     }
 
     public void initMusicSheetVo(SysMusicScore record,CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication
-            ,Map<Integer,CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryMap,Map<Integer, SysMusicScoreCategories> categoriesMap){
+            ,Map<Integer,CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryMap,Map<Integer, String> categoriesMap){
         record.setSubjectName(musicSheetApplication.getSubjectNames());
         record.setRankIds(StringUtils.equals("FREE",musicSheetApplication.getPaymentType()) ? "" : "1");
         record.setCbsMusicSheetId(musicSheetApplication.getId().toString());
@@ -185,10 +189,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         }
         record.setName(musicSheetApplication.getName());
         if(musicSheetApplication.getMusicSheetCategoryId() != null){
-            SysMusicScoreCategories sysMusicScoreCategories = categoriesMap.get(musicSheetApplication.getMusicSheetCategoryId().intValue());
-            if(sysMusicScoreCategories != null){
-                record.setCategoriesName(sysMusicScoreCategories.getName());
-            }
+            record.setCategoriesName(categoriesMap.get(musicSheetApplication.getMusicSheetCategoryId().intValue()));
         }
         record.setSpeed(musicSheetApplication.getPlaySpeed());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();