|
|
@@ -405,7 +405,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
$countWheret1 = implode(' AND ', $countWheret);
|
|
|
$data['total_data']['online_num'] = $this->Lamp_model->get_count($countWheret1);
|
|
|
|
|
|
- $filter2 = $filter.' AND (AI.batstatus != 0 OR AI.panelstatus != 0 OR AI.lampstatus != 0 OR AI.tempstatus != 0 OR AI.onlinestatus != 0) AND (L.controllerstatus = 5 or L.netstatus = 5)';
|
|
|
+ $filter2 = $filter.' AND (AI.batstatus != 0 OR AI.panelstatus != 0 OR AI.lampstatus != 0 OR AI.tempstatus != 0 OR AI.onlinestatus != 0) AND (L.controllerstatus = 5 or L.netstatus = 0)';
|
|
|
$join2 = array();
|
|
|
$join2[] = ['table'=>'project as P', 'cond'=>'L.projectid = P.id', 'type'=>'left'];
|
|
|
$join2[] = ['table'=>'(select lampid,max(updatetime) as maxTime from warning_info_log group by lampid) as WI','cond'=>'WI.lampid = L.id','type'=>'inner'];
|
