From c46038cf5ba637f79cbb12037269f611d232361f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 17 Oct 2025 18:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82-=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Guild.php | 17 +++++++++++++++--
 application/adminapi/controller/Room.php  | 21 +++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php
index c3ad9df..85f7f44 100644
--- a/application/adminapi/controller/Guild.php
+++ b/application/adminapi/controller/Guild.php
@@ -396,15 +396,28 @@ class Guild extends adminApi
         }
         $count = db::name($this->table_guild_user)->alias('a')
             ->join('vs_room b', 'a.room_id = b.id', 'left')
-            ->where(['a.guild_id'=>$guild_id,'a.quit_type'=>['in',[0,3]]])->where($where)->count();
+            ->where(['a.guild_id'=>$guild_id])->where($where)->count();
         $list = db::name($this->table_guild_user)->alias('a')
             ->join('vs_room b', 'a.room_id = b.id', 'left')
-            ->where(['a.guild_id'=>$guild_id,'a.quit_type'=>['in',[0,3]]])->where($where)->page($page, $page_limit)->select();
+            ->where(['a.guild_id'=>$guild_id])->where($where)->page($page, $page_limit)->select();
         if(!$list){
             return V(0,"暂无数据");
         }
         $rum_lists = [];
         foreach ($list as $k=>$v){
+            if($search_stime!="" && $v['createtime'] < strtotime($search_stime)){
+                $search_stime = $search_stime;
+            }else{
+                $search_stime = date('Y-m-d H:i:s',$v['createtime']) ;
+            }
+            if($v['quit_time']){
+                if($search_etime!="" && $v['quit_time'] > strtotime($search_etime)){
+                    $search_etime = $search_etime;
+                }else{
+                    $search_etime = date('Y-m-d H:i:s',$v['quit_time']);
+                }
+            }
+
             $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'];
diff --git a/application/adminapi/controller/Room.php b/application/adminapi/controller/Room.php
index b511fd6..593bfdf 100644
--- a/application/adminapi/controller/Room.php
+++ b/application/adminapi/controller/Room.php
@@ -425,6 +425,12 @@ class Room extends adminApi
         $search_room_id = input('search_room_id', '');
         $search_user_id = input('search_user_id', '');
         $search_status = input('search_status', '');
+        $type_id = input('type_id', '');
+        $label_id = input('label_id', '');
+        $is_hot = input('is_hot', '');
+        $is_top = input('is_top', '');
+        $is_recommend = input('is_recommend', '');
+
         $where=[];
         //房间号
         if($search_room_id!==''){
@@ -437,6 +443,21 @@ class Room extends adminApi
         if($search_status!==''){
             $where['room_status'] = $search_status;
         }
+        if($type_id!==''){
+            $where['type_id'] = $type_id;
+        }
+        if($label_id!==''){
+            $where['label_id'] = $label_id;
+        }
+        if($is_hot!==''){
+            $where['is_hot'] = $is_hot;
+        }
+        if($is_top!==''){
+            $where['is_top'] = $is_top;
+        }
+        if($is_recommend!==''){
+            $where['is_recommend'] = $is_recommend;
+        }
         //房间列表只展示 审核通过的房间
         $where['apply_status'] = 2;//1待审核 2审核通过 3审核失败
         $where['type_id'] = ['<>',6];