no message

api/application/controllers/Map.php

@@ -986,7 +986,7 @@ class Map extends Base_Controller{
         }
 
         // 获取项目下控制器类型
-        $pro_list = $this->db->query('select protocoltype from network where projectid = '.$project_id.' group by protocoltype')->result_array();
+        $pro_list = $this->db->query('select protocoltype from lampinfo where projectid = '.$project_id.' group by protocoltype')->result_array();
         $conStr = '';
         foreach ($pro_list as $p) {
         	if ($conStr != '') {

api/application/models/Lamp_model.php

@@ -619,7 +619,7 @@ class Lamp_model extends Base_model {
 		// 	WHERE L.id = {$id} limit 1";
 		$sql = "SELECT {$field}, L.id as id
 			FROM 	  ( select * from lampinfo where id = {$id} limit 1 ) AS L
-			LEFT JOIN ( select * from battery_cmd where id = {$id} order by updatetime desc limit 1 ) AS BC ON L.id = BC.id
+			-- LEFT JOIN ( select * from battery_cmd where id = {$id} order by updatetime desc limit 1 ) AS BC ON L.id = BC.id
 			WHERE L.id = {$id} limit 1";		
 		$query = $this->db->query($sql);
 		return $query->row_array();