|
|
@@ -351,12 +351,12 @@ class User extends BaseController
|
|
|
$str1 = $arr[0].','.$arr[1];
|
|
|
$stc = str_replace(['省','市','区','县'],['','','',''],$str1);
|
|
|
$str2 = $stc.",".$arr[2]!='市辖区'?str_replace(['省','市','区','县'],['','','',''],$arr[2]):'市辖区';
|
|
|
- $arr = explode(",",$str2);
|
|
|
- $city_id = $cityModel->where('merger_name','like',"%".$arr[1].",".$arr[2])->value('id');
|
|
|
+ $arr3 = explode(",",$str2);
|
|
|
+ $city_id = $cityModel->where('merger_name','like',"%".$arr3[1].",".$arr3[2])->value('id');
|
|
|
if(!$city_id)
|
|
|
{
|
|
|
- $city_id = $cityModel->where('merger_name','like',"%".$arr[0].",".$arr[1])->value('id');
|
|
|
- $city_id1 = $cityModel->where('merger_name','like',"%".$arr[0].",".$arr[1])->value('city_id');
|
|
|
+ $city_id = $cityModel->where('merger_name','like',"%".$arr3[0].",".$arr3[1])->value('id');
|
|
|
+ $city_id1 = $cityModel->where('merger_name','like',"%".$arr3[0].",".$arr3[1])->value('city_id');
|
|
|
$city_id2 = $cityModel->where('parent_id',$city_id1)->where('name','市辖区')->value('id');
|
|
|
if($city_id2>0) $city_id= $city_id2;
|
|
|
}
|