t

9 months ago · 088fe2e779
parent 340a6a6dad
commit 088fe2e779
1 changed files with 2 additions and 2 deletions
--- a/app/api/controller/Merchant.php
+++ b/app/api/controller/Merchant.php
@ -130,9 +130,9 @@ class Merchant extends Controller
    public function list(): Json {
        $model = new MerchantModel;
        $pageSize = $this->request->param('pageSize');
-        $pageSize = empty($pageSize) ?? 15;
+        $pageSize = empty($pageSize) ? 15 : $pageSize;
        $sort = $this->request->param('sort');
-        $sort = empty($sort) ?? "merchant_id";
+        $sort = empty($sort) ? "merchant_id" : $sort;
        $list = $model->getList($this->request->param(), intval($pageSize), $sort)->toArray();

        foreach ($list['data'] as $kr => $r) {