|
@@ -44,12 +44,12 @@ class Syslog extends Base_Controller {
|
|
|
$join = array();
|
|
|
$join[] = ['table'=>'user as U','cond'=>'U.id = S.userid','type'=>'left'];
|
|
|
if (isset($print) && !empty($print)) {
|
|
|
- $data = $this->Syslog_model->get_list_by_join($filter, $field,3000, 0, $join, 'time DESC,id DESC', NUll, 'S');
|
|
|
+ $data = $this->Syslog_model->get_list_by_join($filter, $field,3000, 0, $join, 'S.time DESC,S.id DESC', NUll, 'S');
|
|
|
}else{
|
|
|
|
|
|
- $data = $this->Syslog_model->get_list_by_join($filter, $field,$limit, $offset, $join, 'time DESC,id DESC', NUll, 'S');
|
|
|
+ $data = $this->Syslog_model->get_list_by_join($filter, $field,$limit, $offset, $join, 'S.time DESC,S.id DESC', NUll, 'S');
|
|
|
}
|
|
|
- $total = $this->Syslog_model->get_list_by_multi_join($filter, 'count(*) as total',null, null, $join, 'time DESC,id DESC', NUll, 'S',true);
|
|
|
+ $total = $this->Syslog_model->get_list_by_multi_join($filter, 'count(*) as total',null, null, $join, null, NUll, 'S',true);
|
|
|
$data = empty($data) ? array() : $data;
|
|
|
$total = $total['total'];
|
|
|
|