From 64733bcbeafe6c7c9501c218c295b0116c16ffb1 Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Thu, 8 Sep 2022 18:27:59 +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=952?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/extend/service/CarInfoHandle.php b/extend/service/CarInfoHandle.php
index 13fd149..c373e5b 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 = PeerPhoneT::leftJoin('car_info_t', 'peer_phone_t.phone = car_info_t.car_phone')
+                $query = $query->rightJoin('peer_phone_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']);
+                    ->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)$']]);
             }
         }else {
             $query = $query->order('register_date asc');