Merge branch '20241106_lj_chat'

app/JsonRpc/ChatService.php

@@ -49,10 +49,11 @@ 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)
+            ->orWhere('user.nickname', 'like', '%' . $data['keyword'] . '%')
+            ->orWhere('user.mobile', 'like', '%' . $data['keyword'] . '%')
+            ->where('user.id', '<>', $userId)
+            ->where('user.type_id', '<>', 20000)
+
             ->select(
                 'user.*',
                 'chat_friends.friend_id'
@@ -64,15 +65,6 @@ class ChatService implements ChatServiceInterface
             ->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) {
-                $join->on('user.id', '=', 'chat_friends.friend_id')
-                    ->where('chat_friends.user_id', $userId);
-            })
-            ->select('user.*', 'chat_friends.remark as remark', 'chat_friends.id as isfriend')
-            ->get();
 
         if ($result) {
             return Result::success($result);