|
|
@@ -391,7 +391,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
$res = $this->Lamp_model->get_list_by_multi_join($filter, 'count(*) total',$limit, $offset, $join, "L.number ASC,N.networkname ASC", NUll, 'L',true);
|
|
|
$result = !empty($pid_arr) ? $this->Lamp_model->get_total('L.projectid', $pid_arr, 'L.id') : array();
|
|
|
$result = $this->Lamp_model->get_count(['projectid'=>$pid_arr]);
|
|
|
- $data['total'] = ceil($res['total']/$limit);
|
|
|
+ $data['total'] = $res['total'];
|
|
|
$data['count'] = $result;
|
|
|
$data['fault'] = $res['total'];
|
|
|
exit(json_result('0000', $this->response['0000'], $data));
|
