mirror of https://gitee.com/karson/fastadmin.git
统一风格都用$user->id
parent
f804c8a460
commit
e06f0e2738
|
|
@ -179,14 +179,14 @@ class User extends Api
|
||||||
$bio = $this->request->post('bio');
|
$bio = $this->request->post('bio');
|
||||||
$avatar = $this->request->post('avatar', '', 'trim,strip_tags,htmlspecialchars');
|
$avatar = $this->request->post('avatar', '', 'trim,strip_tags,htmlspecialchars');
|
||||||
if ($username) {
|
if ($username) {
|
||||||
$exists = \app\common\model\User::where('username', $username)->where('id', '<>', $this->auth->id)->find();
|
$exists = \app\common\model\User::where('username', $username)->where('id', '<>', $user->id)->find();
|
||||||
if ($exists) {
|
if ($exists) {
|
||||||
$this->error(__('Username already exists'));
|
$this->error(__('Username already exists'));
|
||||||
}
|
}
|
||||||
$user->username = $username;
|
$user->username = $username;
|
||||||
}
|
}
|
||||||
if ($nickname) {
|
if ($nickname) {
|
||||||
$exists = \app\common\model\User::where('nickname', $nickname)->where('id', '<>', $this->auth->id)->find();
|
$exists = \app\common\model\User::where('nickname', $nickname)->where('id', '<>', $user->id)->find();
|
||||||
if ($exists) {
|
if ($exists) {
|
||||||
$this->error(__('Nickname already exists'));
|
$this->error(__('Nickname already exists'));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue