From efb352c985a9541d3883e85c5b18e6b1351d1c07 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, 21 Aug 2025 15:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E6=88=BF=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E6=88=BF=E9=97=B4=E4=BA=A4=E5=8F=8B=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 9adfb87..290eb59 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1702,6 +1702,12 @@ class Room extends Model
         if(!$owner && !$host){
             return ['code' => 0, 'msg' => '没有权限操作', 'data' => null];
         }
+
+        $roomInfo = db::name('vs_room')->where(['id' => $room_id])->find();
+        if($roomInfo['type_id'] == $type){
+            return ['code' => 0, 'msg' => '房间类型已存在', 'data' => null];
+        }
+
         //开启事务
         db::startTrans();
         $data = [];
@@ -2522,7 +2528,7 @@ class Room extends Model
             $heart_list = db::name('vs_user_friending_heart')->where(['room_id' => $room_id, 'friend_id' => $friend_info['id'], 'status' => 1])->order('heart_value', 'desc')->limit(3)->select();
             if($heart_list){
                 $heart_list_data = [];
-                $heart_list = $heart_list->toArray();
+//                $heart_list = $heart_list->toArray();
                 $pit_number_array_reverse = [0=>[2,5],1=>[1,6],2=>[3,4]];
                 foreach($heart_list as $k=>$v){
                     $heart_list_data[$k]['heartId'] = $v['id'];