From 9d64218d759258e9e0a052facea5b91d57e9201d 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 17:38:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E5=90=8E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/SingerSong.php | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php index d29da1d..a67c22e 100644 --- a/application/api/model/SingerSong.php +++ b/application/api/model/SingerSong.php @@ -389,18 +389,22 @@ class SingerSong extends Model //给前端推送下首歌曲信息 $next_song_info = db::name('vs_song_log')->where(['room_id' => $sonng_log['room_id'],'status' => 0])->order('sort desc')->find(); - $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_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); - $next_song_info['singer_mic_cycle'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'],3); - $next_song_info['song_name'] = $singer_song['song_name']; + if($next_song_info){ + $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_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); + $next_song_info['singer_mic_cycle'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'],3); + $next_song_info['song_name'] = $singer_song['song_name']; + }else{ + $next_song_info = null; + } $data = [ 'text' => '房间下一首演唱歌曲变化',