Merge branch 'feature/admin_optimize' into release

Application/Admin/Controller/QueryController.class.php

@@ -1563,7 +1563,7 @@ class QueryController extends ThinkController
         $data = M()->table('('.$data.') as a')
             ->field("my_time,pay_amount,a.game_id,game_name,game_names,a.promote_id,a.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,tab_ratio.ratio as ratio,turnover_ratio,a.ratio as game_ratio")
             ->join("left join tab_promote on root_id = tab_promote.id")
-            ->join("left join tab_promote_game_ratio as tab_ratio on tab_ratio.game_id = a.relation_game_id and tab_ratio.promote_id=root_id")
+            ->join("left join tab_promote_game_ratio as tab_ratio on tab_ratio.game_id = a.relation_game_id and tab_ratio.promote_id=root_id and tab_ratio.status=1")
 //            ->join("left join tab_cp_game_ratio as game_ratio on game_ratio.game_id = a.game_id")
             ->page($page,$row)
             ->where($map)