|
@@ -412,7 +412,6 @@
|
|
|
from music_sheet t
|
|
|
left join sys_user su on t.create_by_ = su.id_
|
|
|
<where>
|
|
|
- su.del_flag_ = 0
|
|
|
<include refid="QueryInfo"/>
|
|
|
<if test="param.auditVersion != null ">
|
|
|
and #{param.auditVersion} = t.audit_version_
|
|
@@ -485,7 +484,6 @@
|
|
|
left join sys_user su on t.create_by_ = su.id_
|
|
|
left join music_favorite mf on t.id_ = mf.music_sheet_id_
|
|
|
<where>
|
|
|
- su.del_flag_ = 0
|
|
|
<include refid="QueryInfo"/>
|
|
|
<if test="clientType != null">
|
|
|
AND mf.client_type_ = #{clientType}
|
|
@@ -510,7 +508,6 @@
|
|
|
left join sys_user su on t.create_by_ = su.id_
|
|
|
left join music_favorite mf on (t.id_ = mf.music_sheet_id_ and mspr.user_id_ = mf.user_id_ <if test="param.clientType != null"> AND mf.client_type_ = #{param.clientType}</if> )
|
|
|
<where>
|
|
|
- su.del_flag_ = 0
|
|
|
<include refid="QueryInfo"/>
|
|
|
<if test="practiceMusicIdList != null and practiceMusicIdList.size() != 0">
|
|
|
and mspr.id_ in
|
|
@@ -634,9 +631,7 @@
|
|
|
left join music_sheet ms on ms.id_ = msar.music_sheet_id_
|
|
|
left join sys_user su on su.id_ = ms.create_by_
|
|
|
left join sys_user su2 on msar.verify_user_id_ = su2.id_
|
|
|
- <where>
|
|
|
- su.del_flag_ = 0 and
|
|
|
- ms.source_type_ = 'TEACHER'
|
|
|
+ <where>ms.source_type_ = 'TEACHER'
|
|
|
<if test="param.idAndName != null and param.idAndName != ''">
|
|
|
and (su.id_ like concat('%',#{param.idAndName} ,'%')
|
|
|
or su.username_ like concat('%',#{param.idAndName},'%')
|