秘地新的需求池更新版本-5-公会房间列表加总流水

application/adminapi/controller/Room.php

@@ -445,6 +445,8 @@ class Room extends adminApi
         }
         if($type_id!==''){
             $where['type_id'] = $type_id;
+        }else{
+            $where['type_id'] = ['<>',6];
         }
         if($label_id!==''){
             $where['label_id'] = $label_id;
@@ -460,7 +462,6 @@ class Room extends adminApi
         }
         //房间列表只展示 审核通过的房间
         $where['apply_status'] = 2;//1待审核 2审核通过 3审核失败
-        $where['type_id'] = ['<>',6];
         $count = db::name($this->table)->where($where)->count();
         $room_lists = db::name($this->table)->where($where)->page($page, $page_limit)->select();
         $lists = [];