Merge remote-tracking branch 'origin/master'

app/Service/CustomFieldSettingService.php

@@ -37,8 +37,10 @@ class CustomFieldSettingService extends Service
             DB::beginTransaction();
 
             $update = $msg['data'][0];
+            $id = $update['id'];
+            unset($update['id']);
             $model = new CustomFieldDefinitions();
-            $model->where('id', $data['id'])->update($update);
+            $model->where('id', $id)->update($update);
 
             DB::commit();
         }catch (\Exception $exception){
@@ -150,11 +152,11 @@ class CustomFieldSettingService extends Service
                     ->where('del_time',0)
                     ->exists();
             }else{
-                if($this->isEmpty($data,'id')) return [false,'id不能为空！'];
+                if($this->isEmpty($value,'id')) return [false,'id不能为空！'];
                 $bool = CustomFieldDefinitions::where("field_label", $value['field_label'])
                     ->where('top_depart_id', $top_depart_id)
                     ->where('menu_id', $value['menu_id'])
-                    ->where('id','<>',$data['id'])
+                    ->where('id','<>',$value['id'])
                     ->where('del_time',0)
                     ->exists();
                 if(isset($value['field_key'])) unset($data['data'][$key]['field_key']);