From 23c9c2d205680f7c0b7ecd85ee72bd86e3c1ee30 Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Sun, 11 Aug 2024 21:12:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9C=AC=E5=9C=B0=E7=94=9F?= =?UTF-8?q?=E6=B4=BB=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/Index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/Index.php b/app/api/controller/Index.php index 4258b5ca..36b525c9 100755 --- a/app/api/controller/Index.php +++ b/app/api/controller/Index.php @@ -218,11 +218,11 @@ class Index extends Api $data = array(); if ($list) { - $data[] = array_merge($company, $list); + $data = array_merge($company, $list); } if (empty($data) && $company) { - $data[] = $list; + $data = $list; } return JsonServer::success('查询成功', $data); }