|
@@ -1220,9 +1220,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
sum(active) as active_count,
|
|
|
server_id,
|
|
|
ANY_VALUE(cs) cs,
|
|
|
- ANY_VALUE(game_id) gameId
|
|
|
+ ANY_VALUE(game_id) gameId,
|
|
|
+ ANY_VALUE(server_name) serverName
|
|
|
from (select a.country,
|
|
|
a.game_id,
|
|
|
+ a.server_name,
|
|
|
IFNULL(c.role_total_amount, 0) as role_total_amount,
|
|
|
if(b.role_level <= 13, 1, 0) as country_level,
|
|
|
if(d.role_id is not null, 1, 0) as active,
|
|
@@ -1250,15 +1252,15 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
criA.where().andInStrList("server_id", dto.getServerId());
|
|
|
}
|
|
|
criA.where().andNotIsNull("country");
|
|
|
- criA.where().andNotEquals("country","");
|
|
|
- criA.where().andNotEquals("country","null");
|
|
|
- criA.where().andInList("game_id",Arrays.asList(35L,36L,10035L));
|
|
|
+ criA.where().andNotEquals("country", "");
|
|
|
+ criA.where().andNotEquals("country", "null");
|
|
|
+ criA.where().andInList("game_id", Arrays.asList(35L, 36L, 10035L));
|
|
|
return """
|
|
|
select concat(country,',',server_id)
|
|
|
from dm_game_order.t_game_user_role
|
|
|
- """+criA+"""
|
|
|
- group by country,server_id order by count(role_id) desc limit 4
|
|
|
- """;
|
|
|
+ """ + criA + """
|
|
|
+ group by country,server_id order by count(role_id) desc limit 4
|
|
|
+ """;
|
|
|
}
|
|
|
|
|
|
private String getIpInfoListSql(Criteria criA) {
|