update

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

@@ -257,8 +257,9 @@
 			LEFT JOIN sys_user su ON cgtm.user_id_ = su.id_
 			LEFT JOIN teacher t ON su.id_ = t.id_
 			LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
+			LEFT JOIN music_group mg ON cgsp.music_group_id_ = mg.id_
 		  WHERE
-			cgsp.user_id_ = #{studentId} AND cgsp.status_ != 'QUIT' AND cg.del_flag_ = 0
+			cgsp.user_id_ = #{studentId} AND cgsp.status_ != 'QUIT' AND cg.del_flag_ = 0 AND ((cgsp.group_type_ = 'MUSIC' AND mg.status_ = 'PROGRESS') OR cgsp.group_type_ != 'MUSIC')
 		  GROUP BY su.id_
 	</select>
 

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

@@ -266,6 +266,7 @@
         LEFT JOIN music_group mg ON mg.id_ = cgtm.music_group_id_
         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 cgtm.music_group_id_ = sr.music_group_id_
+        AND (mg.status_ = 'PROGRESS' OR mg.status_ IS NULL)
         <if test="search != null">
             AND su.username_ LIKE CONCAT('%',#{search},'%')
         </if>