|
@@ -351,7 +351,7 @@
|
|
|
left join class_group cg on cs.class_group_id_ = cg.id_
|
|
|
left join music_group mg on cg.music_group_id_ = mg.id_
|
|
|
where cs.group_type_ = 'MUSIC' AND cg.group_type_ = 'MUSIC'
|
|
|
- and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m')
|
|
|
+ and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null)
|
|
|
<if test="organId != null">
|
|
|
AND FIND_IN_SET(mg.organ_id_,#{organId})
|
|
|
</if>
|