diff --git a/application/api/model/Login.php b/application/api/model/Login.php
index 019b0b2..61abe5a 100644
--- a/application/api/model/Login.php
+++ b/application/api/model/Login.php
@@ -428,6 +428,13 @@ class Login extends Model
             model('UserToken')->where('id', $user_info['id'])->update(['token' => 1]);
             $isstatus = model('User')->where('id', $user_info['user_id'])->update(['status' => 0]);
             if($isstatus){
+                //查询用户所在房间
+                $room_list = db::name('vs_room_visitor')->where('user_id', $user_info['user_id'])->select();
+                if($room_list){
+                    foreach ($room_list as &$value) {
+                        model('Room')->quit_room($user_info['user_id'], $value['room_id'],$user_info['user_id']);
+                    }
+                }
                 //删除用户
 //                model('Tencent')->account_delete($user_info['user_id']);
                 model('User')->where('id', $user_info['user_id'])->update(['delete_time' => time()]);
@@ -440,13 +447,7 @@ class Login extends Model
                         db::name('vs_room')->where('id', $value['id'])->update(['room_status' => 3]);
                     }
                 }
-                //查询用户所在房间
-                $room_list = db::name('vs_room_visitor')->where('user_id', $user_info['user_id'])->select();
-                if($room_list){
-                    foreach ($room_list as &$value) {
-                        model('Room')->quit_room($user_info['user_id'], $value['room_id'],$user_info['user_id']);
-                    }
-                }
+
             }else{
                 return ['code' => 0, 'msg' => '注销失败', 'data' => null];
             }
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 48310de..eff8500 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -2524,7 +2524,10 @@ class Room extends Model
         if(!$room_id){
             $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];
+        }
         $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];