|
@@ -1172,9 +1172,9 @@ class ChatService implements ChatServiceInterface
|
|
|
*/
|
|
|
public function getBusinessDistrictList(array $data): array
|
|
|
{
|
|
|
- $query = ChatGroupsMember::innerJoin('chat_topics', 'chat_topics.group_id', '=', 'chat_groups_member.group_id')
|
|
|
+ $query = ChatGroupsMember::Join('chat_topics', 'chat_topics.group_id', '=', 'chat_groups_members.group_id')
|
|
|
->leftJoin('chat_topic_class', 'chat_topic_class.id', '=', 'chat_topics.type')
|
|
|
- ->where(['chat_groups_member.user_id' => $data['user_id']])
|
|
|
+ ->where(['chat_groups_members.user_id' => $data['user_id']])
|
|
|
->when($data, function ($query) use ($data) {
|
|
|
if(!empty($data['type'])){
|
|
|
$query->where(['chat_topics.type' => $data['type']]);
|
|
@@ -1186,15 +1186,22 @@ class ChatService implements ChatServiceInterface
|
|
|
$query->whereDate('chat_topics.created_at', $data['created_at']);
|
|
|
}
|
|
|
})
|
|
|
- ->select('chat_topics.*', 'chat_topic_class.topicname')
|
|
|
+ ->select(
|
|
|
+ 'chat_topics.id',
|
|
|
+ 'chat_topics.title',
|
|
|
+ 'chat_topics.author',
|
|
|
+ 'chat_topics.created_at',
|
|
|
+ 'chat_topics.updated_at',
|
|
|
+ 'chat_topic_class.topicname',
|
|
|
+ )
|
|
|
->orderBy('chat_topics.created_at', 'desc');
|
|
|
$total = $query->count();
|
|
|
$list = $query->forPage($data['page'], $data['page_size'])->get();
|
|
|
$result = [
|
|
|
'list' => $list,
|
|
|
'total' => $total,
|
|
|
- 'page' => $data['page'],
|
|
|
- 'page_size' => $data['page_size'],
|
|
|
+ 'page' => intval($data['page']),
|
|
|
+ 'page_size' => intval($data['page_size']),
|
|
|
];
|
|
|
return Result::success($result);
|
|
|
}
|