Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_payment_config_0218

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

@@ -315,7 +315,8 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
         List<StudentSubjectDto> subjects = subjectDao.getSubjectByStudentId(studentIds);
         Map<Integer, StudentSubjectDto> map = new HashMap<>();
         if (!CollectionUtils.isEmpty(subjects)) {
-            map = subjects.stream().collect(Collectors.toMap(StudentSubjectDto::getStudentId, Function.identity()));
+            map = subjects.stream().filter(o->o.getSubjectId() !=null)
+                    .collect(Collectors.toMap(StudentSubjectDto::getStudentId, Function.identity()));
         }
         return map;
     }