Merge remote-tracking branch 'origin/master'

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

@@ -366,7 +366,10 @@
     </select>
     
     <select id="queryClassGroupIdList" resultType="int" parameterType="map">
-      SELECT distinct class_group_id_ FROM class_group_student_mapper WHERE user_id_=#{userId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} AND music_group_id_ = #{musicGroupId}
+      SELECT distinct class_group_id_ FROM class_group_student_mapper WHERE user_id_=#{userId}
+        AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        AND music_group_id_ = #{musicGroupId}
+        AND status_ != 'QUIT'
     </select>
 
     <select id="findMusicGroupClassGroupByType" resultMap="ClassGroupStudentMapper">