|
@@ -570,7 +570,7 @@
|
|
|
<if test="area != null">
|
|
<if test="area != null">
|
|
|
and b.location_area = #{area,jdbcType=INTEGER}
|
|
and b.location_area = #{area,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
|
- order by a.transfer_time ,a.`number`
|
|
|
|
|
|
|
+ order by if(a.transfer_time > um.last_follow_time, a.transfer_time,um.last_follow_time) ,a.`number`
|
|
|
<if test="page_sql != null">
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
${page_sql}
|
|
|
</if>
|
|
</if>
|