pull/1/head
wanghousheng 1 year ago
parent f4642650f2
commit 3f82c0c0e9
  1. 2
      app/api/controller/Recovery.php
  2. 3
      app/api/model/RecoveryOrder.php

@ -85,7 +85,7 @@ class Recovery extends Controller
$where['order_status'] = $order_status;
}
$model = new RecoveryOrder();
$list = $model->getUserList($where);
$list = $model->getUserList($where, 15, ['shop']);
$data['list'] = $list->items();
$data['total'] = $list->total();
if ($data['total']) {

@ -30,7 +30,7 @@ class RecoveryOrder extends BaseRecoveryOrder
* @throws DbException
* @author: wanghousheng
*/
public function getUserList(array $where = [], int $listRows = 15): Paginator
public function getUserList(array $where = [], int $listRows = 15, array $with = []): Paginator
{
// 当前用户ID
$userId = UserService::getCurrentLoginUserId();
@ -39,6 +39,7 @@ class RecoveryOrder extends BaseRecoveryOrder
}
//分销商工程师
return $this
->with($with)
->where($where)
->order(['create_time' => 'desc'])
->paginate($listRows);

Loading…
Cancel
Save