From f4126181abed6dddefe4651d21642d85adc44934 Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Thu, 8 Sep 2022 12:47:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E8=A1=8C=E7=94=B5=E8=AF=9D=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/service/CarInfoHandle.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extend/service/CarInfoHandle.php b/extend/service/CarInfoHandle.php
index 0a206c8..13fd149 100644
--- a/extend/service/CarInfoHandle.php
+++ b/extend/service/CarInfoHandle.php
@@ -152,9 +152,9 @@ class CarInfoHandle
                     ->field('car_info_t.*')->order('car_info_t.register_date asc')
                     ->where('repeat_frame_t.source', $data['source_id']);
             } else if ($data['export_table'] == 'peer_phone_t') {
-                $query = $query->rightJoin('peer_phone_t', 'peer_phone_t.phone = car_info_t.car_phone')
+                $query = PeerPhoneT::leftJoin('car_info_t', 'peer_phone_t.phone = car_info_t.car_phone')
                     ->field('car_info_t.*')->order('car_info_t.register_date asc')
-                    ->where([['peer_phone_t.source', '=', $data['source_id']],['car_info_t.car_number', 'REGEXP', '^[1-9][[:digit:]]{7}((0[[:digit:]])|(1[0-2]))(([0|1|2][[:digit:]])|3[0-1])[[:digit:]]{3}$|^[1-9][[:digit:]]{5}[1-9][[:digit:]]{3}((0[[:digit:]])|(1[0-2]))(([0|1|2][[:digit:]])|3[0-1])[[:digit:]]{3}([0-9]|X)$']]);
+                    ->where('peer_phone_t.source', $data['source_id']);
             }
         }else {
             $query = $query->order('register_date asc');
@@ -732,7 +732,7 @@ class CarInfoHandle
         $orgTitles = ['区域', '购车日期', '客户姓名', '证件号码', '联系方式', '车架号', '车牌号', '发动机号', '品牌型号', '新车购置价', '保险公司', '商业止保日期', '交强止保日期', '被保险人', '被保险人证件号'];
         $bhxTitles = ['line', 'line', 'line', '车牌号', '车架号', '发动机号', '车主证件号码', '车主姓名', '被保人证件号', '被保人姓名', '投保人证件号', '投保人姓名', '品牌型号', '注册日期', '去年投保公司', '交强险到期时间', '商业险到期时间', '客户姓名', '客户电话1', '客户电话2', '客户类别','地址信息', '客户备注1', '客户备注2', '用户姓名', '用户账号'];
         $bmcTitles = ['注册日期', '车牌号', '车架号', '发动机号', '品牌型号', '年款', '排量', '车主', '车主证件号', '联系电话', '新车购置价', '被保险人', '被保险人证件号', '联系电话',  '投保人姓名', '投保人证件号', '联系电话', '上年承保公司', '商业止保日期', '交强止保日期', 'insurer_type', '联系人', '联系电话', '联系人', '联系电话', '联系人', '联系电话'];
-        $orgFields = ['duty_no', 'register_date', 'car_man', 'car_number', 'car_phone', 'car_frame_no', 'car_no', 'engine_no', 'factory_model', 'purchase_price', 'compay', 'insurer1_date', 'insurer2_date', 'id_man', 'id_number'];
+        $orgFields = ['duty_no', 'register_date', 'car_man', 'car_number', 'car_phone', 'car_frame_no', 'car_no', 'engine_no', 'factory_model', 'purchase_price', 'company', 'insurer1_date', 'insurer2_date', 'id_man', 'id_number'];
         if (in_array($export_type, ['bhx', 'failed','success_bmc']) && count($export_field) == 1) {
             $bhxFields = $export_field[0] == 'car_no' ? ['car_no'] : ['car_empty_item', 'car_frame_no'];
         } else {