|
|
@@ -451,7 +451,7 @@
|
|
|
,ms.play_speed_ as playSpeed
|
|
|
,ms.music_price_ as musicPrice
|
|
|
,ms.create_time_ as createTime
|
|
|
- ,if(msar.audit_state_ is null,'DOING',msar.audit_state_) as auditStatus
|
|
|
+ ,if(msar.audit_state_ is null,ms.audit_status_,msar.audit_state_) as auditStatus
|
|
|
,su2.username_ as auditName
|
|
|
from music_sheet ms
|
|
|
left join sys_user su on su.id_ = ms.create_by_
|
|
|
@@ -459,7 +459,8 @@
|
|
|
left join sys_user su2 on msar.verify_user_id_ = su2.id_
|
|
|
<where>
|
|
|
su.del_flag_ = 0 and
|
|
|
- ms.source_type_ = 'TEACHER'
|
|
|
+ ms.source_type_ = 'TEACHER' and
|
|
|
+ msar.id_ is not null
|
|
|
<if test="param.idAndName != null and param.idAndName != ''">
|
|
|
and (su.id_ like concat('%',#{param.idAndName} ,'%')
|
|
|
or su.username_ like concat('%',#{param.idAndName},'%')
|
liweifan