|
...
|
...
|
@@ -210,7 +210,7 @@ class AdminLightOrderController extends AdminBaseController |
|
|
|
$is_set = Db::name('light_order')
|
|
|
|
->alias('lo')
|
|
|
|
->join('light l','lo.light_id=l.id')
|
|
|
|
->where('l.area_id', $id)->field('l.row,l.column')->select()->toArray();
|
|
|
|
->where(['l.area_id'=> $id,'lo.status'=>1,'lo.end_time'=>['>',time()]])->field('l.row,l.column')->select()->toArray();
|
|
|
|
foreach ($arr as $k=>$v){
|
|
|
|
foreach ($is_set as $k1=>$v1){
|
|
|
|
if (array_values($v)==array_values($v1)){
|
...
|
...
|
|
