修改内容：角色战力排行榜

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -162,8 +162,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
     @Override
     public Page<Map> getRoleCombatRanking(RoleCombatRankingDTO dto) {
 
-        //是否查询合服数据(默认查询不合服数据)
-        Boolean isQueryMerge = dto.getIsMergeServer() != null && dto.getIsMergeServer();
+        //是否查询合服数据(默认查询合服数据)
+        Boolean isQueryMerge = true;
+        if (dto.getIsMergeServer() != null) {
+            isQueryMerge = dto.getIsMergeServer();
+        }
         //是否查询超父游戏数据（默认查询父游戏数据）
         Boolean isSuperParentGame = false;
         if (dto.getSuperParentGameId() != null) {
@@ -2559,7 +2562,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		FROM game_ads.ads_role_combat_num_ranking
                 		GROUP BY source_system, super_game_id, server_id, boss_server_id
                 	) d on a.source_system = d.source_system AND a.server_id = d.server_id AND c.super_game_id = d.super_game_id
-                	group by a.source_system ,a.server_id ,d.boss_server_id, c.super_game_id
+                	group by a.source_system ,d.boss_server_id, c.super_game_id
                 ) f on a.source_system = f.f_source_system AND a.super_game_id = f.f_super_game_id AND a.boss_server_id = f.f_boss_server_id
                 LEFT JOIN (
                 	select
@@ -2589,7 +2592,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		FROM game_ads.ads_role_combat_num_ranking
                 		GROUP BY source_system, super_game_id, server_id, boss_server_id
                 	) d on a.source_system = d.source_system AND a.server_id = d.server_id AND c.super_game_id = d.super_game_id
-                	group by a.source_system ,a.server_id ,d.boss_server_id, c.super_game_id
+                	group by a.source_system ,d.boss_server_id, c.super_game_id
                 ) g on a.source_system = g.g_source_system AND a.super_game_id = g.g_super_game_id AND a.boss_server_id = g.g_boss_server_id
                 LEFT JOIN (
                 	SELECT
@@ -2847,7 +2850,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             FROM game_ads.ads_role_combat_num_ranking
                             GROUP BY source_system, super_game_id, server_id, boss_server_id
                         ) d on a.source_system = d.source_system AND a.server_id = d.server_id AND c.super_game_id = d.super_game_id
-                        group by a.source_system ,a.server_id ,d.boss_server_id, c.super_game_id
+                        group by a.source_system ,d.boss_server_id, c.super_game_id
                     ) f on a.source_system = f.f_source_system AND a.super_game_id = f.f_super_game_id AND a.boss_server_id = f.f_boss_server_id
                     LEFT JOIN (
                         select
@@ -2877,7 +2880,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             FROM game_ads.ads_role_combat_num_ranking
                             GROUP BY source_system, super_game_id, server_id, boss_server_id
                         ) d on a.source_system = d.source_system AND a.server_id = d.server_id AND c.super_game_id = d.super_game_id
-                        group by a.source_system ,a.server_id ,d.boss_server_id, c.super_game_id
+                        group by a.source_system ,d.boss_server_id, c.super_game_id
                     ) g on a.source_system = g.g_source_system AND a.super_game_id = g.g_super_game_id AND a.boss_server_id = g.g_boss_server_id
                     LEFT JOIN (
                         SELECT