feature/main20240421
guojia 7 months ago
parent cfd8520dfa
commit 90d0269e43
  1. 2
      app/api/controller/Merchant.php

@ -130,7 +130,7 @@ class Merchant extends Controller
public function list(): Json { public function list(): Json {
$model = new MerchantModel; $model = new MerchantModel;
$pageSize = $this->request->param('pageSize') ?? 15; $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(); $list = $model->getList($this->request->param(), intval($pageSize), $sort)->toArray();
foreach ($list['data'] as $kr => $r) { foreach ($list['data'] as $kr => $r) {

Loading…
Cancel
Save