Merge branch '20241106_lj_chat'

app/JsonRpc/ChatService.php

@@ -49,6 +49,22 @@ class ChatService implements ChatServiceInterface
         $userId = $data['user_id'];
 
         $result = User::where('user_name', 'like', '%' . $data['keyword'] . '%')
+            ->orWhere('nickname', 'like', '%' . $data['keyword'] . '%')
+            ->orWhere('mobile', 'like', '%' . $data['keyword'] . '%')
+            ->where('id', '<>', $userId)
+            ->where('type_id', '<>', 20000)
+            ->select(
+                'user.*',
+                'chat_friends.friend_id'
+            )
+            ->leftJoin('chat_friends', function ($join) use ($userId) {
+                $join->on('user.id', '=', 'chat_friends.friend_id')
+                    ->where('chat_friends.user_id', '=', $userId);
+            })
+            ->get();
+
+        return Result::success($result);
+            ->orWhere('user_name', 'like', '%' . $data['keyword'] . '%')
             ->orWhere('nickname', 'like', '%' . $data['keyword'] . '%')
             ->orWhere('mobile', 'like', '%' . $data['keyword'] . '%')
             ->leftJoin('chat_friends', function ($join) use ($userId) {