|
@@ -50,7 +50,7 @@ public class CbsSubjectServiceImpl implements CbsSubjectService {
|
|
|
List<CbsSubjectApiWrapper.Subject> subjects = subjectService.getDao().queryCbsSubjects(query);
|
|
|
for (CbsSubjectApiWrapper.Subject subject : subjects) {
|
|
|
if(subject.getCbsSubjectId() != null){
|
|
|
- SubjectWrapper.Subject cbsSubject = subjectIdNameMap.get(subject.getCbsSubjectId().intValue());
|
|
|
+ SubjectWrapper.Subject cbsSubject = subjectIdNameMap.get(subject.getSubjectId().intValue());
|
|
|
if (cbsSubject != null) {
|
|
|
List<InstrumentWrapper.Instrument> instruments = cbsSubject.getInstruments();
|
|
|
if (CollectionUtils.isNotEmpty(instruments)) {
|