后台设备模块开发

@@ -201,7 +201,7 @@ class AdminLightOrderController extends AdminBaseController
         if (empty($id)) {
             $id = $this->request->param('id');
         }
-       $re=Db::name('light_order')->whereOr(['end_time'=>['>',time()]])->distinct('light_order')->field('light_id')->select()->toArray();
+       $re=Db::name('light_order')->whereOr(['end_time'=>['>',time()],'status'=>[2||3]])->distinct('light_order')->field('light_id')->select()->toArray();
        $arr=[];
         foreach ($re as $k=>$v){
             array_push($arr,$re[$k]['light_id']);