@ -1051,8 +1051,9 @@ class QueryController extends ThinkController
//关联表获取会长账号名
//关联表获取会长账号名
$data = M()->table('('.$data.') as a')
$data = M()->table('('.$data.') as a')
->field("my_time,pay_amount,game_id,game_name,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")
->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,ratio,last_turnover_ratio")
->join("left join tab_promote on root_id = tab_promote.id")
->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.game_id and tab_ratio.promote_id=root_id")
->page($page,$row)
->page($page,$row)
->where($map)
->where($map)
->group("my_time,game_names,root_id")
->group("my_time,game_names,root_id")
@ -1064,7 +1065,12 @@ class QueryController extends ThinkController