elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/add_item' of wmtx/platform into release

Browse Source 
最大值判断添加
master
郑永星 4 years ago committed by Gogs
parent 8482cd9382 ff21751d31
commit 37d1419bb9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
Application/Admin/Model/CompanyGameRatioModel.class.php
Unescape Escape View File

@ -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,

Write Preview
Loading…
Cancel
Save