mirror of https://gitee.com/karson/fastadmin.git
优化后台回收站列表逻辑
parent
045b756272
commit
f70e1f3349
|
|
@ -72,20 +72,14 @@ trait Backend
|
||||||
$this->request->filter(['strip_tags', 'trim']);
|
$this->request->filter(['strip_tags', 'trim']);
|
||||||
if ($this->request->isAjax()) {
|
if ($this->request->isAjax()) {
|
||||||
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
|
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
|
||||||
$total = $this->model
|
|
||||||
->onlyTrashed()
|
|
||||||
->where($where)
|
|
||||||
->order($sort, $order)
|
|
||||||
->count();
|
|
||||||
|
|
||||||
$list = $this->model
|
$list = $this->model
|
||||||
->onlyTrashed()
|
->onlyTrashed()
|
||||||
->where($where)
|
->where($where)
|
||||||
->order($sort, $order)
|
->order($sort, $order)
|
||||||
->limit($offset, $limit)
|
->paginate($limit);
|
||||||
->select();
|
|
||||||
|
|
||||||
$result = array("total" => $total, "rows" => $list);
|
$result = array("total" => $list->total(), "rows" => $list->items());
|
||||||
|
|
||||||
return json($result);
|
return json($result);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue