Merge branch 'online1'

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

@@ -472,7 +472,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
                 if(studentGroupNamesMap.containsKey(eduOrganStudentListDto.getStudentId())){
                     eduOrganStudentListDto.setMusicGroupNames(studentGroupNamesMap.get(eduOrganStudentListDto.getStudentId()));
                 }
-                if(hasVipCourseStudentIds.contains(eduOrganStudentListDto.getSubjectId())){
+                if(hasVipCourseStudentIds.contains(eduOrganStudentListDto.getStudentId())){
                     eduOrganStudentListDto.setHasVipGroup(1);
                 }
                 if(eduOrganStudentListDto.getCloudStudyUseNum()>0 && eduOrganStudentListDto.getCloudStudyUseTime()>0){

mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -1116,7 +1116,6 @@
         AND cs.status_ = 'NOT_START'
         )) t
         LEFT JOIN sys_user su ON t.user_id_ = su.id_
-        WHERE su.del_flag_ = 0 AND su.organ_id_ = 1
         <include refid="queryCloudStudyStudentDataCondition" />
     </select>