|
@@ -172,22 +172,26 @@ class User extends Api
|
|
|
$avatar = input('avatar', '', 'trim,strip_tags,htmlspecialchars');
|
|
|
$mobile = input('mobile', '');
|
|
|
|
|
|
- if(empty($avatar) && empty($mobile)){
|
|
|
- $this->success();
|
|
|
- }
|
|
|
+ //修改用户
|
|
|
+ $data = [];
|
|
|
|
|
|
- if (\app\common\model\User::where('mobile', $mobile)->where('id', '<>', $this->auth->id)->find()) {
|
|
|
- $this->error(__('Mobile already exists'));
|
|
|
+ if(!empty($avatar))
|
|
|
+ {
|
|
|
+ $data['avatar'] = $avatar;
|
|
|
+ }
|
|
|
+ if(!empty($mobile))
|
|
|
+ {
|
|
|
+ if (\app\common\model\User::where('mobile', $mobile)->where('id', '<>', $this->auth->id)->find()) {
|
|
|
+ $this->error('手机号已存在');
|
|
|
+ }
|
|
|
+ $data['mobile'] = $mobile;
|
|
|
}
|
|
|
|
|
|
- //修改用户
|
|
|
- $data = [
|
|
|
- 'avatar' => $avatar,
|
|
|
- 'mobile' => $mobile,
|
|
|
- ];
|
|
|
- $update_rs = Db::name('user')->where('id',$this->auth->id)->update($data);
|
|
|
- if($update_rs === false){
|
|
|
- $this->error('修改资料失败');
|
|
|
+ if(!empty($data)){
|
|
|
+ $update_rs = Db::name('user')->where('id',$this->auth->id)->update($data);
|
|
|
+ if($update_rs === false){
|
|
|
+ $this->error('修改资料失败');
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
$this->success();
|