no message

api/application/controllers/Map.php

@@ -867,7 +867,7 @@ class Map extends Base_Controller{
     	$failStatus = intval($this->input->post('failStatus',true));
     	if (!empty($failStatus)) $where['status'] = 1;
 
-    	$list = $this->Lamp_model->get_list_in(null, array(), 'L.id,L.number,N.status as netStatus,L.lighteness,L.isfaulted,AI.stralarmtype,AI.status as failStatus',$where);
+    	$list = $this->Lamp_model->get_list_in(null, array(), 'L.id,L.number,N.status as netStatus,L.lighteness,L.isfaulted',$where);
     	$version = $this->session->userdata('version');
     	$data['lampList'] = array();
     	foreach ($list as $value) {
@@ -945,7 +945,8 @@ class Map extends Base_Controller{
         if (!empty($arr['num'])) {
             $online_arr = $this->Lamp_model->getOnlineCount($role, 0, $project_id, $userid, 1);
             $lighting_arr = $this->Lamp_model->getCountByFilter($role, 0, $project_id, $userid, array('L.status'=>1));
-            $failure = $this->Lamp_model->get_fault_count(array('L.projectid'=>$project_id,'L.isfaulted'=>1), $role, 0, $userid);
+            // $failure = $this->Lamp_model->get_fault_count(array('L.projectid'=>$project_id,'L.isfaulted'=>1), $role, 0, $userid);
+            $failure = 0;
             $data['online_rate'] = round($online_arr['num']/$arr['num']*100, 2);
             $data['lighting_rate'] = round($lighting_arr['num']/$arr['num']*100, 2);
             $data['online_count'] = intval($online_arr['num']);

api/application/models/Lamp_model.php

@@ -49,11 +49,11 @@ class Lamp_model extends Base_model {
 			$this->db->where('L.id', $filter['lampid']);
 		}
 
-		if(isset($filter['status']) && is_numeric($filter['status'])){
-			$this->db->where('L.isfaulted', $filter['status']);
-			$this->db->where('AI.stralarmtype !=', '');
-			$this->db->where('AI.status', 0);
-		}
+		// if(isset($filter['status']) && is_numeric($filter['status'])){
+		// 	$this->db->where('L.isfaulted', $filter['status']);
+		// 	$this->db->where('AI.stralarmtype !=', '');
+		// 	$this->db->where('AI.status', 0);
+		// }
         if(isset($filter['lightStatus']) && is_numeric($filter['lightStatus'])){
 			$this->db->where('L.status', $filter['lightStatus']);
 		}