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');