Merge branch 'feature/1022_vip' of http://git.dayaedu.com/yonge/mec into test

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

@@ -1245,7 +1245,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     @Override
     public List<IndexCloudStudySumDto> getCloudStudyStudentOverViewList(List<Integer> organIdsList) {
         List<IndexCloudStudySumDto> list = studentDao.getCloudStudyStudentOverViewList(organIdsList);
-        Set<Integer> organIds = list.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
+        if (CollectionUtils.isEmpty(list)) {
+            return list;
+        }
+        Set<Integer> organIds = list.stream().map(IndexCloudStudySumDto::getOrganId).collect(Collectors.toSet());
         Map<Integer,String> organMap = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
         //获取待激活学员数
         Map<Integer,Long> waitMap = MapUtil.convertIntegerMap(cloudTeacherOrderDao.getWaitActivateMap(organIdsList));