Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into feature/0529-live

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

@@ -2195,7 +2195,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 String subjectId = roomDto.getSubjectId();
                 Subject subject = subjectDao.get(Integer.parseInt(subjectId));
                 //乐理不提醒
-                if(!subject.getParentSubjectId().equals(30)){
+                if(Objects.nonNull(subject) && !subject.getParentSubjectId().equals(30)){
                     Student student = studentDao.get(sysUserService.getUserId());
                     if(!student.getSubjectIdList().equals(subjectId)){
                         vipGroupDetail.setAlertSubjectFlag(true);