|
@@ -70,13 +70,21 @@ class Customer extends Apic
|
|
|
$user_car = Db::name('user_car')->where('user_id','IN',$user_ids)->select();
|
|
|
foreach($list as $key => &$val){
|
|
|
$val['car_number'] = '';
|
|
|
- $car_number = [];
|
|
|
+ $carnumber = '';
|
|
|
foreach($user_car as $k => $v){
|
|
|
if($val['user_id'] == $v['user_id']){
|
|
|
- $car_number[] = $v['car_number'];
|
|
|
+ $carnumber .= $v['car_number'];
|
|
|
+ if(!empty($v['car_model'])){
|
|
|
+ $carnumber .= '('.$v['car_model'].')';
|
|
|
+ }
|
|
|
+ $carnumber .= ',';
|
|
|
}
|
|
|
- $val['car_number'] = implode(',',$car_number);
|
|
|
}
|
|
|
+ if($carnumber != ''){
|
|
|
+ $carnumber = substr($carnumber,0,-1);
|
|
|
+ }
|
|
|
+
|
|
|
+ $val['car_number'] = $carnumber;
|
|
|
}
|
|
|
}
|
|
|
|