|
|
@@ -1844,7 +1844,9 @@
|
|
|
LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ IN ('VIP', 'LIVE') AND vg.group_status_!=7
|
|
|
LEFT JOIN practice_group pg ON pg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'PRACTICE'
|
|
|
WHERE cgsm.user_id_ = #{userId} AND cgsm.status_ != 'QUIT'
|
|
|
- AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2 OR vg.group_status_ = 4 OR (pg.id_ IS NOT NULL AND
|
|
|
+ AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2 OR vg.group_status_ = 4
|
|
|
+ OR (vg.group_type_ = 'LIVE' AND vg.group_status_ IN (1,2,4,5))
|
|
|
+ OR (pg.id_ IS NOT NULL AND
|
|
|
pg.group_status_!='LOCK' AND pg.group_status_!='CANCEL'))
|
|
|
ORDER BY cgsm.music_group_id_
|
|
|
<include refid="global.limit"/>
|
