...
|
...
|
@@ -207,10 +207,10 @@ exit(); |
|
|
if (empty($lightId)){
|
|
|
$lightId=$this->request->param('lightId');
|
|
|
}
|
|
|
$data = Db::name('light_order')
|
|
|
->alias('lo')
|
|
|
->join('light l', 'lo.light_id=l.id')
|
|
|
->where(['l.area_id' => $id, 'lo.status' => 1, 'lo.end_time' => ['>', time()], 'l.id' => ['neq', $lightId]])->field('l.row,l.column,l.id')->select()->toArray();
|
|
|
$data = Db::name('light')
|
|
|
->alias('l')
|
|
|
->join('light_order lo', 'lo.light_id=l.id')
|
|
|
->where(['l.area_id' => $id, 'lo.status' => ['neq',1], 'lo.end_time' => ['<', time()], 'l.id' => ['neq', $lightId]])->field('l.row,l.column,l.id')->select()->toArray();
|
|
|
return json_encode($data);
|
|
|
}
|
|
|
} |
...
|
...
|
|