|
@@ -445,7 +445,7 @@
|
|
|
LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
|
|
|
WHERE
|
|
|
cg.type_ IN ('HIGH','HIGH_ONLINE')
|
|
|
- AND mg.status_ = 'PROGRESS'
|
|
|
+ AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
|
|
|
<if test="organIds!=null and organIds.size()>0">
|
|
|
AND mg.organ_id_ IN
|
|
|
<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
|
|
@@ -465,7 +465,7 @@
|
|
|
LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
|
|
|
WHERE
|
|
|
cg.type_ IN ('HIGH','HIGH_ONLINE')
|
|
|
- AND mg.status_ = 'PROGRESS'
|
|
|
+ AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
|
|
|
<if test="organIds!=null and organIds.size()>0">
|
|
|
AND mg.organ_id_ IN
|
|
|
<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
|