Merge branch 'bug_fix_1212_liu'

app/JsonRpc/UserService.php

@@ -35,7 +35,7 @@ class UserService implements UserServiceInterface
                 'salt'=>$data['salt'],
                 'admin_id'=>isset($data['admin_id']) && $data['admin_id']!=''?$data['admin_id']:0,
 //                'level_id'=>$data['level_id']??0, //会员等级
-                'nickname'=>$data['nickname']??'',
+                'nickname'=>$data['nickname']??$data['user_name'],//把账号同步到昵称里面
                 'last_login_ip'=>$data['last_login_ip']??'',
             ];
             var_dump("user:",$dataUserReq);
@@ -238,6 +238,7 @@ class UserService implements UserServiceInterface
     public function updateUser(array $data): array{
         Db::beginTransaction();
         try{
+            $userInfos = User::where(['id'=>$data['id']])->first(); //查询用户昵称
             $dataUserReq = [
                 'user_name'=>$data['user_name'],
                 'avatar'=>$data['avatar']??'',
@@ -246,7 +247,7 @@ class UserService implements UserServiceInterface
                 'status'=>$data['status']??1,
                 'email'=>$data['email']??'',
                 'admin_id'=>$data['admin_id'],
-                'nickname'=>$data['nickname']??'',
+                'nickname'=>$userInfos['nickname']??$data['user_name'],//存在昵称同步一下，不存在取账号
                 'last_login_ip'=>$data['last_login_ip']??'',
             ];