From 90d0269e43bb677439877851a6d93ca2a9b2d34a Mon Sep 17 00:00:00 2001
From: guojia <445241500@qq.com>
Date: Mon, 6 May 2024 23:02:49 +0800
Subject: [PATCH] trace

---
 app/api/controller/Merchant.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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