diff --git a/application/adminapi/controller/Room.php b/application/adminapi/controller/Room.php index e33beda9..7e04bbc9 100644 --- a/application/adminapi/controller/Room.php +++ b/application/adminapi/controller/Room.php @@ -483,7 +483,12 @@ class Room extends adminApi $where['room_status'] = $search_status; } if($type_id!==''){ - $where['type_id'] = $type_id; + if($type_id == -1){ + $where['type_id'] = 1; + $where['label_id'] = 2; + }else{ + $where['type_id'] = $type_id; + } }else{ $where['type_id'] = ['<>',6]; } @@ -518,8 +523,14 @@ class Room extends adminApi $lists[$key]['user_name'] = model('User')->where(['id'=>$value['user_id']])->value('nickname'); $lists[$key]['room_name'] = $value['room_name']; $lists[$key]['room_cover'] = $value['room_cover']; - $lists[$key]['room_type_str'] = db::name($this->table_room_type)->where(['id'=>$value['type_id']])->value('type_name'); - $lists[$key]['room_label_str'] = db::name($this->table_room_label)->where(['id'=>$value['label_id']])->value('label_name'); + if($value['type_id']==1 && $value['label_id']==2){ + $lists[$key]['room_type_str'] = "练歌房"; + $lists[$key]['room_label_str'] = "练歌房"; + $value['type_id']=-1; + }else{ + $lists[$key]['room_type_str'] = db::name($this->table_room_type)->where(['id'=>$value['type_id']])->value('type_name'); + $lists[$key]['room_label_str'] = db::name($this->table_room_label)->where(['id'=>$value['label_id']])->value('label_name'); + } $lists[$key]['is_recommend'] = $value['is_recommend'] != 1 ? '是' : '否'; $lists[$key]['is_top'] = $value['is_top'] != 1 ? '是' : '否'; $lists[$key]['is_hot'] = $value['is_hot'] != 1 ? '是' : '否';