|
@@ -326,7 +326,7 @@ class ChatService implements ChatServiceInterface
|
|
|
public function addChatRecords(array $data): array
|
|
|
{
|
|
|
Db::beginTransaction();
|
|
|
- try {;
|
|
|
+ try {
|
|
|
//添加会话内容
|
|
|
$ChatRecordsData = [[
|
|
|
'msg_type' => $data['msg_type'] ?? 0,
|
|
@@ -756,7 +756,8 @@ class ChatService implements ChatServiceInterface
|
|
|
{
|
|
|
$groupMember = ChatGroupsMember::where(['group_id' => $data['group_id']])
|
|
|
->leftJoin('user as u1', 'chat_groups_members.user_id', '=', 'u1.id')
|
|
|
- ->select('chat_groups_members.*', 'u1.user_name', 'u1.avatar')
|
|
|
+ ->leftJoin('chat_groups as c1', 'c1.id', '=', 'chat_groups_members.group_id')
|
|
|
+ ->select('chat_groups_members.*', 'u1.user_name', 'u1.avatar', 'c1.group_name as group_name')
|
|
|
->orderBy('id', 'desc')
|
|
|
->get();
|
|
|
return Result::success($groupMember);
|