From 2f3593939b69e8db32d92ba2f0352ecc191b843e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Tue, 16 Sep 2025 19:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=90=9C=E7=B4=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E6=8D=A2=E9=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Search.php |  6 ++++--
 application/api/model/Friend.php      | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/application/api/controller/Search.php b/application/api/controller/Search.php
index ffcb179..10fba64 100644
--- a/application/api/controller/Search.php
+++ b/application/api/controller/Search.php
@@ -35,12 +35,14 @@ class Search extends BaseCom
                 if(is_numeric($search)){
                     $where = [
                         'room_number' => $search,
-                        'apply_status' => 2
+                        'apply_status' => 2,
+                        'type_id' => ['<>',6]
                     ];
                 }else{
                     $where = [
                         'room_name' => ['like', '%'.$search . '%'],
-                        'apply_status' => 2
+                        'apply_status' => 2,
+                        'type_id' => ['<>',6]
                     ];
                 }
 
diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 139b5bc..33ccc35 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -708,15 +708,21 @@ class Friend extends Model
         $result = array_diff_assoc($pit_user, $new_pit_u);//第一个数组中存在但其他数组中不存在的键/值对
         $result2 = array_diff_assoc($new_pit_u, $pit_user);
         if(!empty($result) || !empty($result2)){//换麦
-            if($result){//原有麦位上的用户，且不在新麦位上的用户
-                foreach ($result as $key_result => $value_result){
-                    db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $key_result])->update(['user_id' => 0]);
-                }
-            }
+            db::name('vs_room_pit')->where(['room_id' => $room_id])->update(['user_id' => 0]);
             //新麦位上的用户
             foreach ($new_pit_u as $key_result2 => $value_result2){
                 db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $key_result2])->update(['user_id' => $value_result2]);
             }
+            if($result){//原有麦位上的用户，且不在新麦位上的用户
+                foreach ($result as $key_result => $value_result){
+                    $pit_null = model('api/RoomPit')->getRoomNullPitWithout($room_id, [7,8,9,10]);
+                    if($pit_null){
+                        db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $pit_null])->update(['user_id' => $value_result]);
+                    }else{
+                        db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $key_result])->update(['user_id' => 0]);
+                    }
+                }
+            }
 
             $getRoomNullPit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7]])->select();
             $data_users = [];