Merge branch 'zx_saas_cbs' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -45,7 +45,8 @@ 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, Function.identity()));
+        Map<Long, SubjectWrapper.Subject> cbsSubjectIdNameMap = subjectPageInfo.getRows().stream()
+                .collect(Collectors.toMap(SubjectWrapper.Subject::getCbsSubjectId,o->o,(v1,v2)->v2));
 
         List<CbsSubjectApiWrapper.Subject> subjects = subjectService.getDao().queryCbsSubjects(query);
         for (CbsSubjectApiWrapper.Subject subject : subjects) {
@@ -53,7 +54,7 @@ public class CbsSubjectServiceImpl implements CbsSubjectService {
             if (cbsSubject != null) {
                 List<InstrumentWrapper.Instrument> instruments = cbsSubject.getInstruments();
                 if (CollectionUtils.isNotEmpty(instruments)) {
-                    subject.setSubjectName(instruments.stream().map(e->e.getName()).collect(Collectors.joining(",")));
+                    subject.setSubjectName(instruments.stream().map(InstrumentWrapper.Instrument::getName).collect(Collectors.joining(",")));
                 }
             }
         }