Commit 1abdd4ac authored by Administrator's avatar Administrator

更新订单列表

parent 6fa4bbb1
Pipeline #229 canceled with stages
......@@ -65,6 +65,7 @@ class AlarmOrderController extends Controller
->where($where)
->whereBetween('alarm_order.created_at',$whereBetween)
->limit($limit)
->orderByDesc('id')
->get()->toArray();
$count = AlarmOrder::leftjoin('reportpolice AS r', 'r.id', '=', 'alarm_order.reportpolice_id')
->leftjoin('users AS u', 'alarm_order.user_id', '=', 'u.id')
......@@ -97,6 +98,7 @@ class AlarmOrderController extends Controller
->leftjoin('device_type AS t', 'r.policestatus', '=', 't.tid')
->whereIn('alarm_order.state',explode(',',$request->input('userstate')))
->where('u.id','=',Auth::id())
->orderByDesc('id')
->get()->toArray();
return $this->jsonSuccessData($orders);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment