@@ -121,7 +121,12 @@
</if>
<choose>
<when test="sort != null and sort !='' and sort=='priceDate' and order != null and order !=''">
- order by a.last_price_date ${order}
+ order by
+ CASE
+ WHEN a.last_price_date IS NULL THEN 1
+ ELSE 0
+ END,
+ a.last_price_date ${order}
</when>
<otherwise>
order by a.last_price_date desc