diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php index c9ed6f2..646699b 100644 --- a/application/api/model/Decorate.php +++ b/application/api/model/Decorate.php @@ -391,10 +391,10 @@ class Decorate extends Model $map['user_id'] = $room['user_id']; $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find(); if(empty($user_decorate)){ - return $reslut; + return $room['room_number']; } if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){ - return $reslut; + return $room['room_number']; } $reslut = $user_decorate['special_num'] ?? $room['room_number']; }elseif($type == 8){ @@ -405,10 +405,10 @@ class Decorate extends Model $map['user_id'] = $guild['user_id']; $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find(); if(empty($user_decorate)){ - return $reslut; + return $guild['guild_special_id']; } if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){ - return $reslut; + return $guild['guild_special_id']; } $reslut = $user_decorate['special_num'] ?? $guild['guild_special_id']; }elseif($type == 6){ @@ -419,10 +419,10 @@ class Decorate extends Model $map['user_id'] = $id; $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find(); if(empty($user_decorate)){ - return $reslut; + return $user_code; } if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){ - return $reslut; + return $user_code; } $reslut = $user_decorate['special_num'] ?? $user_code; }else{