From 94529c010238528bcfc567477ae77f6432429e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Fri, 21 Nov 2025 17:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A3=85=E6=89=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Decorate.php | 2 +- application/guildadmin/controller/Room.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php index bb9a3ec..45c7725 100644 --- a/application/api/model/Decorate.php +++ b/application/api/model/Decorate.php @@ -384,7 +384,7 @@ class Decorate extends Model 'type' => $type, 'is_using' => 1 ]; - $user_decorate = db::name('vs_user_decorate')->where($map)->order('id', 'desc')->find(); + $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find(); if(empty($user_decorate)){ return $reslut; } diff --git a/application/guildadmin/controller/Room.php b/application/guildadmin/controller/Room.php index 2820978..b1b2a39 100644 --- a/application/guildadmin/controller/Room.php +++ b/application/guildadmin/controller/Room.php @@ -107,8 +107,8 @@ class Room extends GuildAdmin $search_etime = $search_etime; } $room_info = db::name('vs_room')->where(['id'=>$v['room_id']])->find(); - $rum_lists[$k]['id']=$v['id']; - $rum_lists[$k]['room_id']=$v['room_id']; + $rum_lists[$k]['id']=$v['id'] ?? 0; + $rum_lists[$k]['room_id']=$v['room_id'] ?? 0; $rum_lists[$k]['room_code']= $v['room_number']; //靓号 $room_number = model('api/Decorate')->user_decorate_detail($v['room_id'], 7);