wzh преди 5 години
родител
ревизия
6e4e3d1a80
променени са 1 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 3 3
      api/application/controllers/Syslog.php

+ 3 - 3
api/application/controllers/Syslog.php

@@ -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'];