|
|
@@ -350,7 +350,7 @@ class User extends BaseController
|
|
|
$arr = explode(",",$v);
|
|
|
$str1 = $arr[0].','.$arr[1];
|
|
|
$stc = str_replace(['省','市','区','县'],['','','',''],$str1);
|
|
|
- $str2 = $str1.",".$arr[2]!='市辖区'?str_replace(['省','市','区','县'],['','','',''],$arr[2]):'市辖区';
|
|
|
+ $str2 = $stc.",".$arr[2]!='市辖区'?str_replace(['省','市','区','县'],['','','',''],$arr[2]):'市辖区';
|
|
|
$arr = explode(",",$str2);
|
|
|
$city_id = $cityModel->where('merger_name','like',"%".$arr[1].",".$arr[2])->value('id');
|
|
|
if(!$city_id)
|
