Merge branch '20241224_lj_avator' into dev

app/JsonRpc/UserService.php

@@ -36,7 +36,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']??$data['user_name'],//把账号同步到昵称里面
+                'nickname' => $data['nickname'] ?? $data['user_name'], //把账号同步到昵称里面
                 'last_login_ip' => $data['last_login_ip'] ?? '',
             ];
             var_dump("user:", $dataUserReq);
@@ -240,7 +240,7 @@ class UserService implements UserServiceInterface
     {
         Db::beginTransaction();
         try {
-            $userInfos = User::where(['id'=>$data['id']])->first(); //查询用户昵称
+            $userInfos = User::where(['id' => $data['id']])->first(); //查询用户昵称
             $dataUserReq = [
                 'user_name' => $data['user_name'],
                 'avatar' => $data['avatar'] ?? '',
@@ -249,7 +249,7 @@ class UserService implements UserServiceInterface
                 'status' => $data['status'] ?? 1,
                 'email' => $data['email'] ?? '',
                 'admin_id' => $data['admin_id'],
-                'nickname'=>$userInfos['nickname']??$data['user_name'],//存在昵称同步一下，不存在取账号
+                'nickname' => $userInfos['nickname'] ?? $data['user_name'], //存在昵称同步一下，不存在取账号
                 'last_login_ip' => $data['last_login_ip'] ?? '',
             ];
 
@@ -359,7 +359,7 @@ class UserService implements UserServiceInterface
     {
         Db::beginTransaction();
         try {
-            $data['sort'] = intval($data['sort'])??0;
+            $data['sort'] = intval($data['sort']) ?? 0;
             Role::insertGetId($data);
             $logData = [
                 'user_id' => $data['user_id'],
@@ -543,17 +543,18 @@ class UserService implements UserServiceInterface
     {
         Db::beginTransaction();
         try {
-            $updateData = [];
             $where1 = [
                 'id' => $data['user_id'],
             ];
+            $updateData = [];
             if (!empty($data['nickname'])) {
-                $updateData = ['nickname' => $data['nickname']];
+                $updateData['nickname'] = $data['nickname'];
             }
             if (!empty($data['avatar'])) {
-                $updateData = ['avatar' => $data['avatar']];
+                $updateData['avatar'] = $data['avatar'];
             }
             $result = User::where($where1)->update($updateData);
+
             $updateData = [];
             $where = [
                 'user_id' => $data['user_id'],