diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index b5ec26405..43079c0ee 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -44,10 +44,10 @@ class PartnerController extends ThinkController if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) { $time_start = strtotime($_REQUEST['timestart']); $time_end = strtotime($_REQUEST['timeend'])+ 86399; - $map["_string"] = "(contract_start_time BETWEEN {$time_start} AND {$time_end}) OR (contract_end_time BETWEEN {$time_start} AND {$time_end})"; + $map["_string"] = "(contract_start_time BETWEEN {$time_start} AND {$time_end}) OR (contract_end_time BETWEEN {$time_start} AND {$time_end}) OR (contract_start_time <= {$time_end} AND contract_end_time >= {$time_end}) OR (contract_start_time >0 AND contract_end_time = 0)"; } elseif (isset($_REQUEST['timestart'])) { $time_start = strtotime($_REQUEST['timestart']); - $map["_string"] = "(contract_start_time >= {$time_start} ) OR (contract_end_time >= {$time_start})"; + $map["_string"] = "(contract_start_time >= {$time_start} ) OR (contract_end_time >= {$time_start}) OR ( contract_start_time >0 AND contract_end_time = 0)"; } elseif (isset($_REQUEST['timeend'])) { $time_end = strtotime($_REQUEST['timeend'])+ 86399; $map["_string"] = "(contract_start_time <= {$time_end} ) OR (contract_end_time <= {$time_end})"; diff --git a/Application/Admin/View/PromoteCompany/export.html b/Application/Admin/View/PromoteCompany/export.html index f65b06fec..d325c4d86 100644 --- a/Application/Admin/View/PromoteCompany/export.html +++ b/Application/Admin/View/PromoteCompany/export.html @@ -302,14 +302,14 @@ - - + + - {$game['name']|default="--"} - {$game['ratio']|showPercent} + {$game_ratio2['name']|default="--"} + {$game_ratio2['ratio']|showPercent} - {$game['cp_ratio'][$gamekey]['name']|default="--"} - {$game['cp_ratio'][$gamekey]['ratio']|showPercent} + {$game['cp_ratio'][$gamekey2]['name']|default="--"} + {$game['cp_ratio'][$gamekey2]['ratio']|showPercent} diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html index f47f7dfe1..968d9adbc 100644 --- a/Application/Admin/View/PromoteCompany/lists.html +++ b/Application/Admin/View/PromoteCompany/lists.html @@ -334,11 +334,11 @@ - - + + - {$game['name']|default="--"} - {$game['ratio']|showPercent} + {$game_ratio2['name']|default="--"} + {$game_ratio2['ratio']|showPercent}