From 92f6af6d7f9a3dcd09d7199f6405c7d6e46a38d3 Mon Sep 17 00:00:00 2001
From: guojia <445241500@qq.com>
Date: Mon, 6 May 2024 23:05:11 +0800
Subject: [PATCH] trac

---
 app/api/controller/Merchant.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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) {