|
@@ -107,7 +107,7 @@ class Common extends CI_Controller {
|
|
|
$where = ['level'=>2, 'pid'=>$country_id];
|
|
|
}
|
|
|
if (empty($version)) {
|
|
|
- $data = $this->Global_location_model->get_list($where, 'id, chinese_name as name',null,null,'convert(chinese_name using gbk) ASC,id DESC');
|
|
|
+ $data = $this->Global_location_model->get_list($where, 'id, english_name as name',null,null,'convert(english_name using gbk) ASC,id DESC');
|
|
|
}else{
|
|
|
$data = $this->Global_location_model->get_list($where, 'id, english_name as name',null,null,'convert(english_name using gbk) ASC,id DESC');
|
|
|
}
|
|
@@ -124,7 +124,7 @@ class Common extends CI_Controller {
|
|
|
$where = ['level'=>3, 'pid'=>$province_id];
|
|
|
}
|
|
|
if (empty($version)) {
|
|
|
- $data = $this->Global_location_model->get_list($where, 'id, chinese_name as name',null,null,'convert(chinese_name using gbk) ASC,id DESC');
|
|
|
+ $data = $this->Global_location_model->get_list($where, 'id, english_name as name',null,null,'convert(english_name using gbk) ASC,id DESC');
|
|
|
}else{
|
|
|
$data = $this->Global_location_model->get_list($where, 'id, english_name as name',null,null,'convert(english_name using gbk) ASC,id DESC');
|
|
|
}
|
|
@@ -141,7 +141,7 @@ class Common extends CI_Controller {
|
|
|
$where = ['level'=>4, 'pid'=>$cityId];
|
|
|
}
|
|
|
if (empty($version)) {
|
|
|
- $data = $this->Global_location_model->get_list($where, 'id, chinese_name as name',null,null,'convert(chinese_name using gbk) ASC,id DESC');
|
|
|
+ $data = $this->Global_location_model->get_list($where, 'id, english_name as name',null,null,'convert(english_name using gbk) ASC,id DESC');
|
|
|
}else{
|
|
|
$data = $this->Global_location_model->get_list($where, 'id, english_name as name',null,null,'convert(english_name using gbk) ASC,id DESC');
|
|
|
}
|