fix

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CbsSubjectServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -42,8 +43,11 @@ public class CbsSubjectServiceImpl implements CbsSubjectService {
             subjectQuery.setSubjectIds(subjectIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
         }
         PageInfo<SubjectWrapper.Subject> subjectPageInfo = subjectService.selectPage(subjectQuery);
-        Map<Long, String> cbsSubjectIdNameMap = subjectPageInfo.getRows().stream().collect(Collectors.toMap(SubjectWrapper.Subject::getCbsSubjectId, SubjectWrapper.Subject::getName));
 
+        Map<Long, String> cbsSubjectIdNameMap = subjectPageInfo.getRows().stream()
+            .filter(Objects::nonNull)
+            .filter(subject -> subject.getCbsSubjectId() != null && subject.getName() != null)
+            .collect(Collectors.toMap(SubjectWrapper.Subject::getCbsSubjectId, SubjectWrapper.Subject::getName));
         List<CbsSubjectApiWrapper.Subject> subjects = subjectService.getDao().queryCbsList(query);
         for (CbsSubjectApiWrapper.Subject subject : subjects) {
             Long cbsSubjectId = subject.getCbsSubjectId();