|
...
|
...
|
@@ -207,7 +207,7 @@ exit(); |
|
|
|
$data = Db::name('light')
|
|
|
|
->alias('l')
|
|
|
|
->join('light_order lo', 'lo.light_id=l.id')
|
|
|
|
->where(['l.area_id' => $id,'lo.end_time'=>['!>',time()]])->field('l.row,l.column,l.id')->select()->toArray();
|
|
|
|
->where(['l.area_id' => $id,'lo.status'=>['neq',3]])->field('l.row,l.column,l.id')->select()->toArray();
|
|
|
|
return json_encode($data);
|
|
|
|
}
|
|
|
|
} |
...
|
...
|
|
