1

app/JsonRpc/UserService.php

@@ -155,13 +155,13 @@ class UserService implements UserServiceInterface
                 'mobile' => $data['user_name'],
                 'nickname' => $data['nickname'] ?? $data['user_name'],
                 'avatar' => $data['avatar'] ?? 'https://img.bjzxtw.org.cn/master/image/userDefault.jpg',
-                'gender' => 3,
+                'gender' => $data['gender'] ?? 3,
                 'password' => password_hash('111111', PASSWORD_BCRYPT),
                 'motto' => '',
                 'email' => $data['email'] ?? '',
-                'birthday' => '',
+                'birthday' => $data['birthday'] ?? '',
                 'is_robot' => 2,
-                'status' => $data['status'] ?? 1,
+                'status' =>  isset($data['status']) && $data['status'] === 0 ? 2 : ($data['status'] ?? 1), // 当status为0时设置为2，其他情况保持正常
                 'created_at' => date('Y-m-d H:i:s'),
                 'updated_at' => date('Y-m-d H:i:s')
             ];
@@ -362,6 +362,25 @@ class UserService implements UserServiceInterface
             ];
 
             $userRep = User::where(['id' => $data['id']])->update($dataUserReq);
+            //插入 imp  users
+            $dataImpUserReq = [
+                'mobile' => $data['user_name'],
+            ];
+
+            // 只有在数据存在时才设置字段，避免设置空值
+            if (!empty($data['nickname'])) {
+                $dataImpUserReq['nickname'] = $data['nickname'];
+            }
+
+            if (!empty($data['avatar'])) {
+                $dataImpUserReq['avatar'] = $data['avatar'];
+            }
+
+            if (!empty($data['email'])) {
+                $dataImpUserReq['email'] = $data['email'];
+            }
+            UserImp::where(['id' => $data['id']])->update($dataImpUserReq);
+
             $data['other'] = is_array($data['other']) ?   json_encode($data['other'] ?? []) : $data['other'];
             $data['city_arr_id'] = is_array($data['city_arr_id']) ?   json_encode($data['city_arr_id'] ?? []) : $data['city_arr_id'];
             $data['address_arr_id'] = is_array($data['address_arr_id']) ?   json_encode($data['address_arr_id'] ?? []) : $data['address_arr_id'];
@@ -414,6 +433,9 @@ class UserService implements UserServiceInterface
             ];
             $resultRoleUserRep = RoleUser::where(['user_id' => $data['id']])->update($roleUserData);
             var_dump("修改用户角色权限：", $resultRoleUserRep);
+            //处理imp
+
+
             Db::commit();
         } catch (\Throwable $ex) {
             Db::rollBack();
@@ -632,6 +654,11 @@ class UserService implements UserServiceInterface
                 return Result::error('您输入的密码错误');
             }
             $userRep = User::where(['id' => $data['user_id']])->update($dataUserReq);
+
+            $dataImpUserReq = [
+                password_hash($data['new_password1'], PASSWORD_BCRYPT), // 使用bcrypt加密密码
+            ];
+            UserImp::where(['id' => $data['id']])->update($dataImpUserReq);
             Db::commit();
         } catch (\Throwable $ex) {
             Db::rollBack();
@@ -678,6 +705,18 @@ class UserService implements UserServiceInterface
                 $updateData['avatar'] = $data['avatar'];
             }
             $result = User::where($where1)->update($updateData);
+            //imp
+            $dataImpUserReq = [
+                'nickname' => $data['nickname'], // 如果nickname为空则使用user_name
+                'avatar' => $data['avatar'] ?? '',
+            ];
+            if (empty($data['nickname'])) {
+                unset($dataImpUserReq['nickname']);
+            }
+            if (empty($data['avatar'])) {
+                unset($dataImpUserReq['avatar']);
+            }
+            UserImp::where(['id' => $data['user_id']])->update($dataImpUserReq);
 
             $updateData = [];
             $where = [