From 63a9c478d158c44e65ccbb1e1b8e6f9dac4a4dc8 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, 17 Nov 2025 15:20:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=A1=E6=81=AF=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/SingerSong.php | 4 ++--
 application/api/model/SingerSong.php      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/api/controller/SingerSong.php b/application/api/controller/SingerSong.php
index db0e754..6393bb8 100644
--- a/application/api/controller/SingerSong.php
+++ b/application/api/controller/SingerSong.php
@@ -156,13 +156,13 @@ class SingerSong extends BaseCom
         if ($reslut) {
             //给前端推送下首歌曲信息
             $next_song_info = db::name('vs_song_log')->where(['id' => $id])->find();
-            $next_song_info['boss_id'] = $next_song_info['user_id'];
+            $next_song_info['boss_user_id'] = $next_song_info['user_id'];
             $next_song_info['boss_nickname'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('nickname');
             $next_song_info['boss_avatar'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('avatar');
             $next_song_info['boss_dress'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'], 1);
             $next_song_info['boss_mic_cycle'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'],3);
             $singer_song = db::name('vs_singer_song')->where(['id' => $next_song_info['singer_song_id']])->find();
-            $next_song_info['singer_id'] = $singer_song['user_id'];
+            $next_song_info['singer_user_id'] = $singer_song['user_id'];
             $next_song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
             $next_song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar');
             $next_song_info['singer_dress'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'], 1);
diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php
index f82185d..bca47dc 100644
--- a/application/api/model/SingerSong.php
+++ b/application/api/model/SingerSong.php
@@ -210,6 +210,7 @@ class SingerSong extends Model
                 $next_song_info['boss_dress'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'], 1);
                 $next_song_info['boss_mic_cycle'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'],3);
                 $singer_song = db::name('vs_singer_song')->where(['id' => $next_song_info['singer_song_id']])->find();
+                $next_song_info['singer_user_id'] = $singer_song['user_id'];
                 $next_song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
                 $next_song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar');
                 $next_song_info['singer_dress'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'], 1);