|
@@ -496,9 +496,9 @@
|
|
|
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 cg.group_type_ = 'VIP')
|
|
|
- OR (mg.status_ = 'PROGRESS' AND cg.group_type_ = 'MUSIC' AND (mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId}))
|
|
|
- OR (csg.status_ = 'NORMAL' AND csg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'COMM'))
|
|
|
+ AND ((vg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'VIP')
|
|
|
+ OR (cg.group_type_ = 'MUSIC' AND (mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId}))
|
|
|
+ OR (csg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'COMM'))
|
|
|
GROUP BY cg.id_
|
|
|
</select>
|
|
|
|
|
@@ -510,8 +510,8 @@
|
|
|
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 cg.del_flag_ = 0 AND
|
|
|
- ((vg.group_status_ = 2 AND cg.group_type_ = 'VIP' AND vg.educational_teacher_id_ = #{userId} AND vg.organ_id_ = #{organId})
|
|
|
- OR (mg.status_ = 'PROGRESS' AND cg.group_type_ = 'MUSIC' AND mg.educational_teacher_id_ = #{userId} AND mg.organ_id_ = #{organId})
|
|
|
+ ((vg.group_status_ IN (2,6) AND cg.group_type_ = 'VIP' AND vg.educational_teacher_id_ = #{userId} AND vg.organ_id_ = #{organId})
|
|
|
+ OR (mg.status_ IN ('PROGRESS','PAUSE') AND cg.group_type_ = 'MUSIC' AND mg.educational_teacher_id_ = #{userId} AND mg.organ_id_ = #{organId})
|
|
|
OR (csg.status_ = 'NORMAL' AND cg.group_type_ = 'COMM' AND csg.educational_teacher_id_ = #{userId} AND csg.organ_id_ = #{organId}))
|
|
|
GROUP BY cg.id_
|
|
|
</select>
|
|
@@ -522,7 +522,7 @@
|
|
|
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_
|
|
|
- WHERE mg.team_teacher_id_ = #{userId} AND cg.del_flag_ = 0 AND mg.status_ = 'PROGRESS' AND cg.group_type_ = 'MUSIC'
|
|
|
+ WHERE mg.team_teacher_id_ = #{userId} AND cg.del_flag_ = 0 AND mg.status_ IN ('PROGRESS','PAUSE') AND cg.group_type_ = 'MUSIC'
|
|
|
GROUP BY cg.id_
|
|
|
</select>
|
|
|
|
|
@@ -531,7 +531,7 @@
|
|
|
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 mg.director_user_id_ = #{userId} AND cg.del_flag_ = 0 AND mg.status_ = 'PROGRESS'
|
|
|
+ WHERE mg.director_user_id_ = #{userId} AND cg.del_flag_ = 0 AND mg.status_ IN ('PROGRESS','PAUSE')
|
|
|
GROUP BY cg.id_
|
|
|
</select>
|
|
|
|