sort logbook and station list by name
这个提交包含在:
父节点
58a2346de6
当前提交
5f39e99d47
共有 2 个文件被更改,包括 3 次插入 和 1 次删除
|
|
@ -11,6 +11,7 @@ class Logbooks_model extends CI_Model {
|
|||
|
||||
function show_all() {
|
||||
$this->db->where('user_id', $this->session->userdata('user_id'));
|
||||
$this->db->order_by('logbook_name');
|
||||
return $this->db->get('station_logbooks');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@ class Stations extends CI_Model {
|
|||
$this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id','left');
|
||||
$this->db->group_by('station_profile.station_id');
|
||||
$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
|
||||
$this->db->or_where('station_profile.user_id =', NULL);
|
||||
$this->db->or_where('station_profile.user_id =', NULL);
|
||||
$this->db->order_by('station_profile.station_profile_name');
|
||||
return $this->db->get();
|
||||
}
|
||||
|
||||
|
|
|
|||
正在加载…
在新工单中引用