From fadce97c0297b3dbbbcdbc09e0154e331d95e398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 15 Sep 2025 19:42:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E6=97=A0=E5=85=B3=E7=B3=BB=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A4=B4=E5=83=8F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 3f45159..9c73d51 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -190,13 +190,13 @@ class Friend extends Model
 
                     if($room_ids['data']){
                         $text['text'] = '交友结束并创建房间';
-                        $text['relation_name'] = $relation;
                         $text['room_id'] = $room_ids['data'];//前端用来让用户跳转的房间id
                     }
                 }
             }else{
                 $text['text'] = '交友结束未创建房间';
             }
+            $text['relation_name'] = $relation;
             $text['user1_id'] = $user1;
             $text['user2_id'] = $user2;
             $text['user1_avatar'] = db::name('user')->where(['id'=>$user1])->value('avatar');