From b55f77d5c3e94177ec3d1ce21fce629a756733b6 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 15 Jul 2023 15:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/CompanyLists.php | 4 ++--
 app/adminapi/logic/CompanyLogic.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/adminapi/lists/CompanyLists.php b/app/adminapi/lists/CompanyLists.php
index c50e44089..a6b1a883d 100644
--- a/app/adminapi/lists/CompanyLists.php
+++ b/app/adminapi/lists/CompanyLists.php
@@ -38,7 +38,7 @@ class CompanyLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['level_two', 'level_one', 'company_name', 'organization_code', 'city', 'district', 'town', 'company_type', 'master_name', 'master_position', 'master_phone', 'master_email', 'other_contacts', 'area_manager', 'is_contract', 'account', 'password', 'deposit', 'deposit_time', 'qualification', 'status'],
+            '=' => ['level_two', 'level_one', 'company_name', 'organization_code', 'city', 'area', 'street', 'company_type', 'master_name', 'master_position', 'master_phone', 'master_email', 'other_contacts', 'area_manager', 'is_contract', 'account', 'password', 'deposit', 'deposit_time', 'qualification', 'status'],
         ];
     }
 
@@ -55,7 +55,7 @@ class CompanyLists extends BaseAdminDataLists implements ListsSearchInterface
     public function lists(): array
     {
         return Company::where($this->searchWhere)
-            ->field(['id', 'level_two', 'level_one', 'company_name', 'organization_code', 'city', 'district', 'town', 'company_type', 'master_name', 'master_position', 'master_phone', 'master_email', 'other_contacts', 'area_manager', 'is_contract', 'account', 'password', 'deposit', 'deposit_time', 'qualification', 'status'])
+            ->field(['id', 'level_two', 'level_one', 'company_name', 'organization_code', 'city', 'area', 'street', 'company_type', 'master_name', 'master_position', 'master_phone', 'master_email', 'other_contacts', 'area_manager', 'is_contract', 'account', 'password', 'deposit', 'deposit_time', 'qualification', 'status'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
diff --git a/app/adminapi/logic/CompanyLogic.php b/app/adminapi/logic/CompanyLogic.php
index 79205ffeb..88e7cf759 100644
--- a/app/adminapi/logic/CompanyLogic.php
+++ b/app/adminapi/logic/CompanyLogic.php
@@ -46,8 +46,8 @@ class CompanyLogic extends BaseLogic
                 'company_name' => $params['company_name'],
                 'organization_code' => $params['organization_code'],
                 'city' => $params['city'],
-                'district' => $params['district'],
-                'town' => $params['town'],
+                'area' => $params['area'],
+                'street' => $params['street'],
                 'company_type' => $params['company_type'],
                 'master_name' => $params['master_name'],
                 'master_position' => $params['master_position'],
@@ -91,8 +91,8 @@ class CompanyLogic extends BaseLogic
                 'company_name' => $params['company_name'],
                 'organization_code' => $params['organization_code'],
                 'city' => $params['city'],
-                'district' => $params['district'],
-                'town' => $params['town'],
+                'area' => $params['area'],
+                'street' => $params['street'],
                 'company_type' => $params['company_type'],
                 'master_name' => $params['master_name'],
                 'master_position' => $params['master_position'],