From ff21751d3108c3b10195184bfd88d1377ff4443b Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Nov 2020 14:48:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Model/CompanyGameRatioModel.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Model/CompanyGameRatioModel.class.php b/Application/Admin/Model/CompanyGameRatioModel.class.php index 1f20fef58..7c03414c7 100644 --- a/Application/Admin/Model/CompanyGameRatioModel.class.php +++ b/Application/Admin/Model/CompanyGameRatioModel.class.php @@ -48,7 +48,7 @@ class CompanyGameRatioModel extends Model if ($value['begin_time'] > $company_begin_time) { $game_ratio[$game_id] = array_merge($game_ratio[$game_id],$this->getGameRadio($company_id,$game_id,$company_belong,$company_begin_time,$value['begin_time'])); - if ($value['end_time'] >= $company_end_time) { + if ($value['end_time'] >= $company_end_time || !$value['end_time']) { // $game_ratio[$game_id] = array_merge($game_ratio[$game_id],[[ // "begintime" => $value['begin_time'], // "endtime"=>$company_end_time, @@ -75,7 +75,7 @@ class CompanyGameRatioModel extends Model } } } else { - if ($value['end_time'] >= $company_end_time) { + if ($value['end_time'] >= $company_end_time || !$value['end_time']) { // $game_ratio[$game_id] = array_merge($game_ratio[$game_id],[[ // "begintime" => $company_begin_time, // "endtime"=>$company_end_time,