diff --git a/app/api/controller/Recovery.php b/app/api/controller/Recovery.php index 4ef1d21b..513e58fe 100644 --- a/app/api/controller/Recovery.php +++ b/app/api/controller/Recovery.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']) { diff --git a/app/api/model/RecoveryOrder.php b/app/api/model/RecoveryOrder.php index 94a3749a..be5ba28a 100644 --- a/app/api/model/RecoveryOrder.php +++ b/app/api/model/RecoveryOrder.php @@ -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);