...
|
...
|
@@ -207,7 +207,7 @@ class AdminLightOrderController extends AdminBaseController |
|
|
$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')->select()->toArray();
|
|
|
->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();
|
|
|
return json_encode($data);
|
|
|
}
|
|
|
} |
...
|
...
|
|