|
|
@@ -402,7 +402,7 @@ class ChatService implements ChatServiceInterface
|
|
|
->leftJoin('user as u1', 'chat_records.user_id', '=', 'u1.id')
|
|
|
->leftJoin('user as u2', 'chat_records.receiver_id', '=', 'u2.id')
|
|
|
->select('chat_records.*', 'u1.user_name as user_id_name', 'u1.avatar as user_avatar', 'u2.user_name as receiver_id_name', 'u2.avatar as receiver_avatar')
|
|
|
- ->orderBy('id', 'asc')->paginate(100);
|
|
|
+ ->orderBy('id', 'asc')->paginate(100, ['*'], $data['page'] ?? 1);
|
|
|
//更新聊天记录已读
|
|
|
ChatRecords::where('user_id', $userId)
|
|
|
->where('receiver_id', $friendId)
|
|
|
@@ -437,7 +437,7 @@ class ChatService implements ChatServiceInterface
|
|
|
->leftJoin('user as u1', 'chat_records.user_id', '=', 'u1.id')
|
|
|
->leftJoin('user as u2', 'chat_records.group_receiver_id', '=', 'u2.id')
|
|
|
->select('chat_records.*', 'u1.user_name as user_id_name', 'u1.avatar as user_avatar', 'u2.user_name as receiver_id_name', 'u2.avatar as receiver_avatar')
|
|
|
- ->orderBy('id', 'asc')->paginate(100);
|
|
|
+ ->orderBy('id', 'asc')->paginate(100, ['*'], $data['page'] ?? 1);
|
|
|
//更新群聊天记录
|
|
|
ChatRecords::where('receiver_id', $group_id)
|
|
|
->where('user_id', $userId)
|
|
|
@@ -582,7 +582,7 @@ class ChatService implements ChatServiceInterface
|
|
|
->leftJoin('chat_groups', 'chat_groups_members.group_id', '=', 'chat_groups.id')
|
|
|
->select('chat_groups.*', 'chat_groups_members.group_id as group_id')
|
|
|
->orderBy('chat_groups.id', 'desc')
|
|
|
- ->paginate(100);
|
|
|
+ ->paginate(100, ['*'], $data['page'] ?? 1);
|
|
|
return Result::success($result);
|
|
|
}
|
|
|
/**
|
|
|
@@ -717,7 +717,7 @@ class ChatService implements ChatServiceInterface
|
|
|
$result = ChatTopic::where($where)
|
|
|
->leftJoin('user', 'user.id', '=', 'chat_topics.user_id')
|
|
|
->select('chat_topics.*', 'user.nickname', 'user.avatar', 'user.user_name')
|
|
|
- ->paginate($data['page_size']);
|
|
|
+ ->paginate($data['page_size'], ['*'], $data['page'] ?? 1);
|
|
|
return Result::success($result);
|
|
|
}
|
|
|
public function getTopic(array $data): array
|
|
|
@@ -813,7 +813,7 @@ class ChatService implements ChatServiceInterface
|
|
|
$result = ChatTopicsReply::where(['topic_id' => $data['id']])
|
|
|
->leftJoin('user', 'user.id', '=', 'chat_topics_reply.user_id')
|
|
|
->select('chat_topics_reply.*', 'user.nickname', 'user.avatar', 'user.user_name')
|
|
|
- ->paginate($data['page_size']);
|
|
|
+ ->paginate($data['page_size'], ['*'], $data['page'] ?? 1);
|
|
|
return Result::success($result);
|
|
|
}
|
|
|
|
|
|
@@ -929,7 +929,7 @@ class ChatService implements ChatServiceInterface
|
|
|
$result = ChatTopic::where($where)
|
|
|
->leftJoin('user', 'user.id', '=', 'chat_topics.user_id')
|
|
|
->select('chat_topics.*', 'user.nickname', 'user.avatar', 'user.user_name')
|
|
|
- ->paginate($data['page_size']);
|
|
|
+ ->paginate($data['page_size'], ['*'], $data['page'] ?? 1);
|
|
|
return Result::success($result);
|
|
|
}
|
|
|
}
|
AI