管乐迷曲目来源内容平台

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

@@ -44,17 +44,19 @@ public class CbsSubjectServiceImpl implements CbsSubjectService {
             subjectQuery.setSubjectIds(subjectIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
         }
         PageInfo<SubjectWrapper.Subject> subjectPageInfo = subjectService.selectPage(subjectQuery);
-        Map<Long, SubjectWrapper.Subject> cbsSubjectIdNameMap = subjectPageInfo.getRows().stream()
-                .collect(Collectors.toMap(SubjectWrapper.Subject::getCbsSubjectId,o->o,(v1,v2)->v2));
+        Map<Integer, SubjectWrapper.Subject> subjectIdNameMap = subjectPageInfo.getRows().stream()
+                .collect(Collectors.toMap(SubjectWrapper.Subject::getId,o->o,(v1,v2)->v2));
 
         List<CbsSubjectApiWrapper.Subject> subjects = subjectService.getDao().queryCbsSubjects(query);
         for (CbsSubjectApiWrapper.Subject subject : subjects) {
-            SubjectWrapper.Subject cbsSubject = cbsSubjectIdNameMap.get(subject.getCbsSubjectId());
-            if (cbsSubject != null) {
-                List<InstrumentWrapper.Instrument> instruments = cbsSubject.getInstruments();
-                if (CollectionUtils.isNotEmpty(instruments)) {
-                    subject.setSubjectName(instruments.stream().map(InstrumentWrapper.Instrument::getName).collect(Collectors.joining(",")));
-                    subject.setInstrumentId(instruments.get(0).getId().longValue());
+            if(subject.getCbsSubjectId() != null){
+                SubjectWrapper.Subject cbsSubject = subjectIdNameMap.get(subject.getCbsSubjectId().intValue());
+                if (cbsSubject != null) {
+                    List<InstrumentWrapper.Instrument> instruments = cbsSubject.getInstruments();
+                    if (CollectionUtils.isNotEmpty(instruments)) {
+                        subject.setSubjectName(instruments.stream().map(InstrumentWrapper.Instrument::getName).collect(Collectors.joining(",")));
+                        subject.setInstrumentId(instruments.get(0).getId().longValue());
+                    }
                 }
             }
         }