合并分支 'heshupeng' 到 'master'

后台添加管理员，头像数据



查看合并请求 !243

@@ -92,7 +92,7 @@ class HouseAdmin extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
                         $this->model->validateFailException(true)->validate($validate);
                         $this->model->validateFailException(true)->validate($validate);
                     }
                     }
-                    $params['avatar'] = Db::name('user')->where('id',$data['user_id'])->value('avatar');
+                    $params['avatar'] = Db::name('user')->where('id',$params['user_id'])->value('avatar');
                     $result = $this->model->allowField(true)->save($params);
                     $result = $this->model->allowField(true)->save($params);
 
 
                     $house_admin_id = $this->model->getLastInsID();
                     $house_admin_id = $this->model->getLastInsID();
@@ -154,7 +154,7 @@ class HouseAdmin extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                         $row->validateFailException(true)->validate($validate);
                     }
                     }
-                    $params['avatar'] = Db::name('user')->where('id',$data['user_id'])->value('avatar');
+                    $params['avatar'] = Db::name('user')->where('id',$params['user_id'])->value('avatar');
                     $result = $row->allowField(true)->save($params);
                     $result = $row->allowField(true)->save($params);
                     Db::commit();
                     Db::commit();
                 } catch (ValidateException $e) {
                 } catch (ValidateException $e) {