|
@@ -298,7 +298,7 @@
|
|
<if test="isAlarm == '1'.toString()">
|
|
<if test="isAlarm == '1'.toString()">
|
|
AND a.status not in ('1','2')
|
|
AND a.status not in ('1','2')
|
|
</if>
|
|
</if>
|
|
- order by (case when a.status in ('1','2') then 2 else 1 end), a.modify_time desc
|
|
|
|
|
|
+ order by ifnull((select c.status from care_event_order c where c.older_id = a.id order by c.create_time desc limit 1),99), a.modify_time desc
|
|
LIMIT #{pageUtil.start}, #{pageUtil.pageSize}
|
|
LIMIT #{pageUtil.start}, #{pageUtil.pageSize}
|
|
</select>
|
|
</select>
|
|
|
|
|