|
@@ -428,10 +428,10 @@
|
|
|
LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
|
|
|
LEFT JOIN courses_group csg ON csg.id_ = cg.music_group_id_ AND cg.group_type_ = 'COMM'
|
|
|
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' OR vg.group_status_ = 2 OR csg.status_ = 'NORMAL')
|
|
|
- OR (vg.group_status_ = 2 AND vg.educational_teacher_id_ = #{userId}) OR (csg.status_ = 'NORMAL' AND csg.educational_teacher_id_ = #{userId})
|
|
|
+ AND cg.del_flag_ = 0 AND ((mg.status_ = 'PROGRESS' OR vg.group_status_ = 2 OR csg.status_ = 'NORMAL')
|
|
|
+ OR (vg.group_status_ = 2 AND vg.educational_teacher_id_ = #{userId}) OR (csg.status_ = 'NORMAL' AND csg.educational_teacher_id_ = #{userId}))
|
|
|
<if test="search != null">
|
|
|
- AND cg.name_ LIKE CONCAT('%',#{search},'%')
|
|
|
+ AND (cg.name_ LIKE CONCAT('%',#{search},'%') OR cg.group_name_ LIKE CONCAT('%',#{search},'%'))
|
|
|
</if>
|
|
|
GROUP BY cg.id_
|
|
|
</select>
|