From 1c43699dcf5a7db064cc0176b7441e9688ac505f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 26 Aug 2023 10:14:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/CompanyLists.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/lists/CompanyLists.php b/app/adminapi/lists/CompanyLists.php
index 0e28987f4..ea287a393 100644
--- a/app/adminapi/lists/CompanyLists.php
+++ b/app/adminapi/lists/CompanyLists.php
@@ -110,13 +110,18 @@ class CompanyLists extends BaseAdminDataLists implements ListsSearchInterface
     public function list_two(): array
     {
 
-        $list= Company::where('company_type','in',[30,16])
+        $params=$this->request->param();
+        $where=['company_type'=>30];
+        if(isset($params['company_type'])){
+            $where=['company_type'=>$params['company_type']];
+        };
+        $list= Company::where($where)
             ->field(['is_authentication','id', 'company_name', 'organization_code', 'city', 'area', 'street', 'company_type', 'master_name', 'master_position', 'master_phone', 'master_email', 'other_contacts', 'area_manager', 'is_contract', 'deposit', 'deposit_time', 'qualification', 'status'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
             ->toArray();
-            return ['list'=>$list,'page'=>$this->limitOffset,'limit'=>$this->limitLength];
+            return ['list'=>$list,'page_no'=>$this->limitOffset+1,'page_size'=>$this->limitLength];
     }
     /**
      * @notes 获取数量