后台设备模块开发

@@ -139,10 +139,10 @@ class AdminLightController extends AdminBaseController
                 array_push($arr, [$r,$c]);
             }
         }
-        if (empty($lightId)){
-            $lightId=$this->request->param('lightId');
+        $is_set = Db::name('light')->where(['area_id'=>$id,'id'=>['neq',$this->request->param('lightId')]])->field('row,column')->select()->toArray();
+        if (!empty($lightId)) {
+            $is_set = Db::name('light')->where(['area_id'=> $id,'id'=>['neq',$lightId]])->field('row,column')->select()->toArray();
         }
-        $is_set = Db::name('light')->where(['area_id'=> $id,'id'=>['neq',$lightId]])->field('row,column')->select()->toArray();
         foreach ($arr as $k=>$v){
             foreach ($is_set as $k1=>$v1){
             if (array_values($v)==array_values($v1)){