Merge branch 'feature/group_type' into dev

Application/Admin/Controller/QueryController.class.php

@@ -1449,8 +1449,9 @@ class QueryController extends ThinkController
         }
 
         $map = [];
+        setPowerPromoteIds($map,'root_id');
 
-        if ($_REQUEST['promote_id']) {
+        if ($_REQUEST['promote_id']||$_REQUEST['promote_id']=='0') {
             $map['root_id'] = $_REQUEST['promote_id'];
         }
 
@@ -1475,7 +1476,6 @@ class QueryController extends ThinkController
             ->order("my_time Desc")
             ->select(false);
 
-        setPowerPromoteIds($map,'root_id');
 
         $count = M()->table('('.$data.') as a')
             ->field("my_time,pay_amount,game_id,game_names,promote_id,promote_account,a.company_relation,a.company_belong,CASE WHEN root_id is null THEN 0 ELSE root_id END as root_id,CASE WHEN account is null THEN '官方渠道' ELSE account END as account")
@@ -1496,6 +1496,8 @@ class QueryController extends ThinkController
             ->group("my_time,game_names,root_id")
             ->order("my_time Desc")
             ->select();
+//        var_dump($data);die();
+
 //        dump($data);die();
 
         $pagecount = M()->table('('.$count.') as a')->count();