From fb86fac9def4366d8f88a3011e72d76e13d5d1f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Mon, 29 Sep 2025 18:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E6=B5=81=E6=B0=B4=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Guild.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php
index 8e80281..2afca90 100644
--- a/application/api/model/Guild.php
+++ b/application/api/model/Guild.php
@@ -770,11 +770,17 @@ class Guild extends Model
          $room_data = [];
          $i=0;
           foreach ($list as $k=>$v){
+              $add_guild_time = $v['createtime'];
               if(!$start_time){
-                  $start_time = $v['createtime'];
+                  $start_time = $add_guild_time;
                   $end_time = time();
-              }else{
-                  $start_time = strtotime($start_time." 00:00:00");
+              } else{
+                  if(strtotime($start_time) < $add_guild_time){
+                      $start_time = $add_guild_time;
+                  }else{
+                      $start_time = strtotime($start_time);
+                  }
+                  $start_time = $start_time;
                   $end_time = strtotime($end_time." 23:59:59");
               }
               $room_info = db::name('vs_room')->where(['id'=>$v['room_id'],'room_status'=>1,'delete_time'=>0])->find();