Browse Source

no message

wzh 5 years ago
parent
commit
8a679fa861
1 changed files with 1 additions and 1 deletions
  1. 1 1
      api/application/controllers/Home.php

+ 1 - 1
api/application/controllers/Home.php

@@ -429,7 +429,7 @@ class Home extends Base_Controller {
         $join[] = ['table'=>'global_location as G1','cond'=>'G1.id = P.cityid','type'=>'left'];
         $join[] = ['table'=>'global_location as G2','cond'=>'G2.id = G1.pid','type'=>'left'];
         $join[] = ['table'=>'global_location as G3','cond'=>'G3.id = G2.pid','type'=>'left'];
-        $list = $this->Lamp_model->get_list_by_join($where1, 'P.projectname as project,P.id as projectid,WI.batstatus,WI.id,L.id as lampid,WI.panelstatus,WI.lampstatus,WI.onlinestatus,WI.tempstatus,P.cityid,L.address,L.section,G1.english_name as areaName,G2.english_name as cityName,G3.english_name as proName,WI.updatetime,G1.timezone',NULL, NULL, $join, NULL, NUll, 'L');
+        $list = $this->Lamp_model->get_list_by_join($where1, 'P.projectname as project,P.id as projectid,WI.batstatus,WI.id,L.id as lampid,WI.panelstatus,WI.lampstatus,WI.onlinestatus,WI.tempstatus,P.cityid,L.address,L.section,G1.english_name as areaName,G2.english_name as cityName,G3.english_name as proName,WI.updatetime,G1.timezone',NULL, NULL, $join, 'WI.updatetime DESC', NUll, 'L');
 
         $batstatus = $this->config->item('batstatus');
         $panelstatus = $this->config->item('panelstatus');