Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

master
zhengyongxing 5 years ago
commit 1922e29542

@ -121,7 +121,7 @@ class FinancePromoteController extends AdminController
}
private function getJoinPromoteData($map,$istimeselect,$type="spend")
{
setPowerPromoteIds($map,"s.promote_id");
// setPowerPromoteIds($map,"s.promote_id");
if ($_REQUEST['promote_id'] != '') {
if ($_REQUEST['promote_id'] == 0) {
$map['s.promote_id'] = 0;
@ -277,7 +277,7 @@ class FinancePromoteController extends AdminController
}
private function promoteUserData($map,$istimeselect,$type="spend")
{
setPowerPromoteIds($map,"s.promote_id");
// setPowerPromoteIds($map,"s.promote_id");
if ($_REQUEST['promote_id'] != '') {
if ($_REQUEST['promote_id'] == 0) {
$map['s.promote_id'] = 0;

Loading…
Cancel
Save