diff --git a/application/adminapi/controller/Room.php b/application/adminapi/controller/Room.php index 7382d24..37c5830 100644 --- a/application/adminapi/controller/Room.php +++ b/application/adminapi/controller/Room.php @@ -1241,7 +1241,7 @@ class Room extends adminApi if($apply_status!==''){ $where['apply_status'] = $apply_status; }else{ - $where['apply_status'] = ['<>',2]; + $where['apply_status'] = 1; } $count = db::name($this->table)->where($where)->count(); diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 80b0544..d635580 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -272,7 +272,7 @@ class Room extends Model $roomInfo = db::name('vs_room') ->field('id as room_id,room_number,user_id,room_name,room_cover,apply_status,type_id,room_status,label_id') ->where('user_id' , $uid) - ->where(['type_id' => ['<>',6],'room_status' =>1]) + ->where(['type_id' => ['<>',6],'room_status' =>1,'apply_status' => 2]) ->page($page, $page_limit) ->select(); }