diff --git a/app/api/controller/Merchant.php b/app/api/controller/Merchant.php index 72030e05..d4acc29c 100644 --- a/app/api/controller/Merchant.php +++ b/app/api/controller/Merchant.php @@ -129,8 +129,8 @@ class Merchant extends Controller */ public function list(): Json { $model = new MerchantModel; - $pageSize = $this->request->param('pageSize') ?? 15; - $sort = $this->request->param('sort') && !empty($this->request->param('sort')) ?? "merchant_id"; + $pageSize = $this->request->param('pageSize', 15); + $sort = $this->request->param('sort', "merchant_id"); $list = $model->getList($this->request->param(), intval($pageSize), $sort)->toArray(); foreach ($list['data'] as $kr => $r) {