no message

api/application/controllers/Home.php

@@ -443,7 +443,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, 'WI.updatetime DESC', 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,L.netstatus',NULL, NULL, $join, 'WI.updatetime DESC', NUll, 'L');
 
         $batstatus = $this->config->item('batstatus');
         $panelstatus = $this->config->item('panelstatus');
@@ -462,7 +462,7 @@ class Home extends Base_Controller {
             if (isset($panelstatus[$value['panelstatus']])) $temp2[] = $panelstatus[$value['panelstatus']];
             if (isset($lampstatus[$value['lampstatus']])) $temp2[] = $lampstatus[$value['lampstatus']];
             if (isset($tempstatus[$value['tempstatus']])) $temp2[] = $tempstatus[$value['tempstatus']];
-            if (isset($onlinestatus[$value['onlinestatus']])) $temp2[] = $onlinestatus[$value['onlinestatus']];
+            if (isset($onlinestatus[$value['onlinestatus']]) && $value['netstatus'] == 0) $temp2[] = $onlinestatus[$value['onlinestatus']];
             $list[$key]['fault_type'] = implode(',', $temp2);
 
             unset($list[$key]['cityName']);
@@ -470,8 +470,10 @@ class Home extends Base_Controller {
             unset($list[$key]['areaName']);
             unset($list[$key]['timezone']);
             unset($list[$key]['updatetime']);
+            if (empty($temp2)) unset($list[$key]);
         }
 
+        $list = array_values($list);
     	exit(json_result('0000',$this->response['0000'],array('list'=>$list)));
     }