修改b端接口：调研选题-获取研究员列表；创建用户；

app/JsonRpc/NewsService.php

@@ -9163,7 +9163,7 @@ class NewsService implements NewsServiceInterface
    */
   public function getAllResearcher(array $data): array
   {
-    $where['user.type_id'] = 4;
+    $where['role_user.role_id'] = 21;
     if(!empty($data['id'])){
       $where['user.id'] = $data['id'];
     }
@@ -9171,6 +9171,7 @@ class NewsService implements NewsServiceInterface
       array_push($where, ['user_info.real_name', 'like', '%'.$data['real_name'].'%']);
     }
     $users = User::leftJoin('user_info', 'user.id', '=', 'user_info.user_id')
+    ->leftJoin('role_user', 'user.id', '=', 'role_user.user_id')
     ->where($where)
     ->select('user.id', 'user_info.real_name')
     ->get()->toArray();

app/JsonRpc/UserService.php

@@ -33,8 +33,7 @@ class UserService implements UserServiceInterface
 
             //獲取user的id,user_name,avatar,nickname,組成數據，批量插入imp users中，如果已經存在則替換，密碼用111111加密，加密算法是bcrypt
             // 获取所有用户数据
-            $users = User::query()->select('id', 'user_name', 'avatar', 'nickname')->get()->toArray();
-
+            $users = User::query()->select('id', 'user_name', 'avatar', 'nickname', 'email')->get()->toArray();
             if (!empty($users)) {
                 $insertData = [];
                 $now = date('Y-m-d H:i:s');
@@ -98,6 +97,10 @@ class UserService implements UserServiceInterface
             $data['address_arr_id'] = is_array($data['address_arr_id']) ?   json_encode($data['address_arr_id'] ?? []) : $data['address_arr_id'];
             var_dump("user:", $dataUserReq);
             $userid = User::query()->insertGetId($dataUserReq);
+            if (!$userid) {
+                Db::rollBack();
+                return Result::error('创建用户失败');
+            }
             // $data['administrative_unit_arr_id'] = is_array($data['administrative_unit_arr_id']) ?   json_encode($data['administrative_unit_arr_id'] ?? []): $data['administrative_unit_arr_id'];
             $dataUserInfoReq = [
                 'user_id' => $userid,
@@ -139,16 +142,26 @@ class UserService implements UserServiceInterface
                 'company_url' => $data['company_url'] ?? '',
 
             ];
-            var_dump("UserINfo:::", $dataUserInfoReq);
-
+            // return Result::success($dataUserInfoReq);
             $userInfoId = UserInfo::query()->insertGetId($dataUserInfoReq);
+            if (!$userInfoId) {
+                Db::rollBack();
+                return Result::error('创建用户信息失败');
+            }
             $roleUserData = [
                 'role_id' => isset($data['role_id']) && $data['role_id'] != '' ? $data['role_id'] : 0,
                 'user_id' => $userid,
                 'admin_user_id' => isset($data['admin_id']) && $data['admin_id'] != '' ? $data['admin_id'] : 0,
             ];
-            RoleUser::insert($roleUserData);
-            var_dump("userInfo:", $userInfoId);
+            // return Result::success($roleUserData);
+
+
+            $roleUserId = RoleUser::query()->insertGetId($roleUserData);
+            if (!$roleUserId) {
+                Db::rollBack();
+                return Result::error('创建用户角色失败');
+            }
+            // var_dump("userInfo:", $userInfoId);
 
             //处理imp
             $impUserData = [
@@ -166,19 +179,24 @@ class UserService implements UserServiceInterface
                 'created_at' => date('Y-m-d H:i:s'),
                 'updated_at' => date('Y-m-d H:i:s')
             ];
-
+            // return Result::success($impUserData);
             // 使用 REPLACE INTO 实现存在则替换的逻辑
-            Db::connection('imp')->table('users')->updateOrInsert(
+            $impUserId = Db::connection('imp')->table('users')->updateOrInsert(
                 ['mobile' => $data['user_name']],
                 $impUserData
             );
+            if (!$impUserId) {
+                Db::rollBack();
+                return Result::error('创建imp用户失败');
+            }
             Db::commit();
+            
+            return Result::success(["id" => $userid]);
         } catch (\Throwable $ex) {
             Db::rollBack();
-            var_dump($ex->getMessage());
-            return Result::error("创建失败", 0);
+            // var_dump($ex->getMessage());
+            return Result::error($ex->getMessage(), 0);
         }
-        return $userInfoId ? Result::success(["id" => $userid]) : Result::error("创建失败", 0);
     }
 
     /**