diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 1e34c2b17..c2913a8d7 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1920,8 +1920,8 @@ class QueryController extends BaseController $userAccount = I('user_account', ''); $promoteId = I('promote_id', 0); $sdkVersion = I('sdk_version', 0); - $costBegin = I('cost_begin', 0); - $costEnd = I('cost_end', 0); + $costBegin = I('cost_begin', ''); + $costEnd = I('cost_end', ''); $headmanPromoteId = I('headman_promote_id', 0); $promote = $this->getLoginPromote(); @@ -1985,13 +1985,13 @@ class QueryController extends BaseController $spendMap['promote_id'] = $promoteId; } } - if ($costBegin > 0 || $costEnd > 0) { + if ($costBegin != '' || $costEnd != '') { $having = ''; - if ($costBegin > 0 && $costEnd > 0) { + if ($costBegin != '' && $costEnd != '') { $having = 'sum(cost) between ' . $costBegin . ' and ' . $costEnd; - } elseif ($costBegin > 0 && $costEnd == 0) { + } elseif ($costBegin != '' && $costEnd == '') { $having = 'sum(cost) > ' . $costBegin; - } elseif ($costBegin == 0 && $costEnd > 0) { + } elseif ($costBegin == '' && $costEnd != '') { $having = 'sum(cost) < ' . $costEnd; } $subMap = $map; diff --git a/Application/Home/View/default/Query/arpu.html b/Application/Home/View/default/Query/arpu.html index 13c28b900..cbd0971e5 100644 --- a/Application/Home/View/default/Query/arpu.html +++ b/Application/Home/View/default/Query/arpu.html @@ -289,6 +289,12 @@ var gameId = $('#game-select').val(); }) function getSubPromotes(parentId, defaultPromoteId) { + if (parentId == 0) { + var options = '' + $('#promote-select').html(options) + $("#promote-select").val(defaultPromoteId).trigger("change") + return + } $.ajax({ url: "{:U('Query/getSubPromotes')}", dataType: 'json', diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index b9fcd08f4..6f1819ea5 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -75,9 +75,9 @@ -->