From 20079ba01f09900f287a8c458cdfff7783103c67 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:35:46 +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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php
index bca47dc..d29da1d 100644
--- a/application/api/model/SingerSong.php
+++ b/application/api/model/SingerSong.php
@@ -261,8 +261,16 @@ class SingerSong extends Model
                 $where['status'] = ['in','1,0'];
                 break;
         }
-        $res = db::name('vs_song_log')->where($where)->order('sort desc')->page($page,$page_limit)->select();
+
         $count = db::name('vs_song_log')->where($where)->count();
+        if($type == 1){
+            $res1 = db::name('vs_song_log')->where(['status' => 1,'room_id' => $room_id])->order('id desc')->select();
+            $res2 = db::name('vs_song_log')->where(['status' => 0,'room_id' => $room_id])->order('sort desc')->page($page,$page_limit-1)->select();
+            //把$res2 添加到$res1的 最后
+            $res = array_merge($res1,$res2);
+        }else{
+            $res = db::name('vs_song_log')->where($where)->order('sort desc')->page($page,$page_limit)->select();
+        }
         if ($res) {
             foreach ($res as $k => $v) {
                 $res[$k]['boss_nickname'] = db::name('user')->where(['id' => $v['user_id']])->value('nickname');
@@ -274,6 +282,7 @@ class SingerSong extends Model
                 $res[$k]['singer_nickname'] = db::name('user')->where(['id' => db::name('vs_singer_song')->where(['id' => $v['singer_song_id']])->value('user_id')])->value('nickname');
             }
         }
+
         return ['code' => 1, 'msg' => '获取成功', 'data' => ['count' => $count, 'lists' =>$res]];
     }