Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -266,7 +266,7 @@
         LEFT JOIN music_group mg ON mg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'MUSIC'
         LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'VIP'
         WHERE (cgtm.user_id_ = #{teacherId} OR mg.team_teacher_id_ = #{teacherId} OR mg.educational_teacher_id_ = #{teacherId}
-        OR director_user_id_ = #{teacherId}) AND su.id_ IS NOT NULL AND sr.music_group_status_ != 'QUIT'
+        OR director_user_id_ = #{teacherId}) AND su.id_ IS NOT NULL AND (sr.music_group_status_ != 'QUIT' OR sr.id_ IS NULL)
         AND (mg.status_ = 'PROGRESS' OR vg.group_status_ IN (2,4) OR cgsm.group_type_ = 'PRACTICE')
         <if test="search != null">
             AND su.username_ LIKE CONCAT('%',#{search},'%')