diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php index ec65d01d..cc9f53bb 100644 --- a/application/api/model/SingerSong.php +++ b/application/api/model/SingerSong.php @@ -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);