From 4fd83d42755f5a02fbde396883fa0d8ed3c19967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 25 Sep 2025 01:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 03e90f2..c805f00 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1307,6 +1307,7 @@ class Room extends Model
             ->join('user b', 'a.user_id = b.id')
             ->field('a.user_id,b.nickname,b.avatar')
             ->where(['a.room_id' => $room_id,'b.is_online' => 1])
+            ->group('a.user_id')
             ->order('a.id asc')
             ->page($page, $limit)
             ->select();
@@ -2530,14 +2531,12 @@ class Room extends Model
             $room_id = Db::name('vs_room_visitor')->where('user_id', $user_id)->order('id desc')->value('room_id');
         }
         $room = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->find();
-        if($room){
-            return ['code' => 1, 'msg' => '操作成功', 'data' => null];
-        }else{
+        if(!$room){
             $room_info = db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]);
             if(!$room_info){
                 return ['code' => 0, 'msg' => '加入房间失败', 'data' => null];
             }
-            return ['code' => 1, 'msg' => '操作成功', 'data' => null];
         }
+        return ['code' => 1, 'msg' => '操作成功', 'data' => null];
     }
 }
\ No newline at end of file