|
@@ -147,17 +147,13 @@
|
|
|
FROM sys_music_score ses
|
|
|
LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_
|
|
|
<if test="recentFlag !=null and recentFlag == true">
|
|
|
- <if test="subjectId != null">
|
|
|
- right JOIN sys_music_compare_record sms ON ses.id_ = sms.sys_music_score_id_ and sms.user_id_ = #{userId} and sms.client_id_ = #{clientId}
|
|
|
- </if>
|
|
|
+ right JOIN sys_music_compare_record sms ON ses.id_ = sms.sys_music_score_id_ and sms.user_id_ = #{userId} and sms.client_id_ = #{clientId}
|
|
|
</if>
|
|
|
<include refid="queryPageSql"/>
|
|
|
GROUP BY ses.id_
|
|
|
order by
|
|
|
<if test="recentFlag !=null and recentFlag == true">
|
|
|
- <if test="subjectId != null">
|
|
|
- max(sms.create_time_) desc,
|
|
|
- </if>
|
|
|
+ max(sms.create_time_) desc,
|
|
|
</if>
|
|
|
ses.cbs_music_categories_id_ DESC,ses.order_ ASC,ses.create_time_ DESC,ses.id_ desc
|
|
|
<include refid="global.limit"/>
|