|
@@ -1470,14 +1470,14 @@
|
|
|
<select id="queryGroupClassGroupIds" resultType="java.lang.Long">
|
|
|
SELECT cg.id_ FROM music_group mg
|
|
|
LEFT JOIN class_group cg ON cg.music_group_id_ = mg.id_
|
|
|
- WHERE mg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'MUSIC' AND cg.del_flag_ = 0
|
|
|
+ WHERE mg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'MUSIC' AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
|
|
|
UNION
|
|
|
SELECT cg.id_ FROM vip_group vg
|
|
|
LEFT JOIN class_group cg ON cg.music_group_id_ = vg.id_
|
|
|
- WHERE vg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'VIP' AND cg.del_flag_ = 0
|
|
|
+ WHERE vg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'VIP' AND vg.group_status_ = 2 AND cg.del_flag_ = 0
|
|
|
UNION
|
|
|
SELECT cg.id_ FROM practice_group pg
|
|
|
LEFT JOIN class_group cg ON cg.music_group_id_ = pg.id_
|
|
|
- WHERE pg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'PRACTICE' AND cg.del_flag_ = 0
|
|
|
+ WHERE pg.educational_teacher_id_ = #{userId} AND cg.group_type_ = 'PRACTICE' AND pg.group_status_ = 'NORMAL' AND cg.del_flag_ = 0
|
|
|
</select>
|
|
|
</mapper>
|