|
@@ -268,7 +268,7 @@
|
|
|
LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
|
|
|
LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
|
|
|
<where>
|
|
|
- cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT'
|
|
|
+ cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND mg.status_ = 'PROGRESS'
|
|
|
<if test="userId != null">
|
|
|
AND cgsm.user_id_ = #{userId}
|
|
|
</if>
|
|
@@ -359,7 +359,8 @@
|
|
|
SELECT cg.id_,cg.name_,cg.student_num_,cg.img_,mg.name_ group_name_ FROM class_group_teacher_mapper cgtm
|
|
|
LEFT JOIN class_group cg ON cgtm.class_group_id_ = cg.id_
|
|
|
LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
|
|
|
- WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId}) AND cg.del_flag_ = 0
|
|
|
+ WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId})
|
|
|
+ AND cg.del_flag_ = 0 AND mg.status_ = 'PROGRESS'
|
|
|
<if test="search != null">
|
|
|
AND cg.name_ LIKE CONCAT('%',#{search},'%')
|
|
|
</if>
|