|
@@ -271,13 +271,13 @@ class Common extends CI_Controller {
|
|
|
|
|
|
// 获取制造商下拉列表
|
|
|
public function manu_nav(){
|
|
|
- $list = $this->db->query('select id,name,no,companyId from company where type = 2 and companyId != ""')->result_array();
|
|
|
+ $list = $this->db->query('select id,name,no,companyId from company where type = 2 and companyId != "" order by companyId ASC')->result_array();
|
|
|
foreach ($list as $key => $value) {
|
|
|
if (!empty($value['no'])) {
|
|
|
$list[$key]['name'] = $value['no'];
|
|
|
}
|
|
|
|
|
|
- $list[$key]['name'] .= '---'.substr($value['companyId'], 0,2);
|
|
|
+ $list[$key]['name'] = substr($value['companyId'], 0,2).'---'.$list[$key]['name'];
|
|
|
}
|
|
|
exit(json_result('0000',$this->response['0000'],['list'=>$list]));
|
|
|
}
|