YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-12-12 20:22:13 +08:00
parent 6fea1aa312 d6eb1c19fd
commit 1f1a9c52a7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/api/model/SingerSong.php
View File

@@ -281,7 +281,7 @@ class SingerSong extends Model
$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();
$res1 = db::name('vs_song_log')->where(['status' => 1,'room_id' => $room_id])->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);