|
|
@@ -494,10 +494,10 @@
|
|
|
LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_
|
|
|
LEFT JOIN courses_group csg ON csg.id_ = cg.music_group_id_
|
|
|
WHERE cgtm.user_id_ != #{userId} AND cg.del_flag_ = 0
|
|
|
- AND ((vg.group_status_ = 2 AND vg.educational_teacher_id_ = #{userId} AND vg.organ_id_ = #{organId} AND cg.group_type_ = 'VIP')
|
|
|
+ AND ((vg.group_status_ = 2 AND vg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'VIP')
|
|
|
OR (mg.status_ = 'PROGRESS' AND (mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId})
|
|
|
- AND mg.organ_id_ = #{organId} AND cg.group_type_ = 'MUSIC')
|
|
|
- OR (csg.status_ = 'NORMAL' AND csg.educational_teacher_id_ = #{userId} AND csg.organ_id_ = #{organId} AND cg.group_type_ = 'COMM'))
|
|
|
+ AND cg.group_type_ = 'MUSIC')
|
|
|
+ OR (csg.status_ = 'NORMAL' AND csg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'COMM'))
|
|
|
GROUP BY cg.id_
|
|
|
</select>
|
|
|
|
