|
|
@@ -1360,7 +1360,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
select country,
|
|
|
country_level,
|
|
|
sum(role_total_amount) as role_total_amount,
|
|
|
- count(1) as role_count,
|
|
|
+ count(role_id) as role_count,
|
|
|
sum(active) as active_count,
|
|
|
server_id,
|
|
|
ANY_VALUE(cs) cs,
|
|
|
@@ -1373,7 +1373,8 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
if(b.role_level <= 13, 0, 1) as country_level,
|
|
|
if(d.role_id is not null, 1, 0) as active,
|
|
|
a.server_id,
|
|
|
- concat(a.country,',',a.server_id) as cs
|
|
|
+ concat(a.country,',',a.server_id) as cs,
|
|
|
+ b.role_id role_id
|
|
|
from dm_game_order.t_server_country a
|
|
|
left join dm_game_order.t_game_user_role b on a.country = b.country and a.server_id = b.server_id
|
|
|
left join (
|
