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

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

@@ -164,8 +164,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
 
         //是否查询合服数据(默认查询合服数据)
         Boolean isQueryMerge = true;
-        if (dto.getIsMergeServer() != null) {
-            isQueryMerge = dto.getIsMergeServer();
+        //如果不传值，查看的是原始服数据
+        if (dto.getIsMergeServer() == null || dto.getIsMergeServer() == Boolean.FALSE) {
+            isQueryMerge = false;
         }
         //是否查询超父游戏数据（默认查询超父游戏数据）
         Boolean isSuperParentGame = true;
@@ -1880,7 +1881,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		super_game_id , -- 超父游戏ID
                 		MAX(super_game_name) as super_game_name , -- 超父游戏名
                 		server_id, -- 区服ID
-                		IFNULL(MAX(h.server_name), MAX(a.server_name)) as server_name, -- 区服名
+                		IFNULL(MAX(i.server_name), MAX(a.server_name)) as server_name, -- 区服名
                 		MAX(dt) as dt, -- 开服日期
                 		TIMESTAMPDIFF(DAY, MAX(dt), NOW()) start_day, -- 开服天数
                 		boss_server_id, -- 合服ID
@@ -2091,6 +2092,14 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 			is_merge -- 是否参与过合服
                 		FROM dm_game_order.t_game_server_merge
                 	) h on a.source_system = h.h_source_system AND a.boss_server_id = h.h_server_id AND a.super_game_id = h.h_game_id
+                	LEFT JOIN (
+                		SELECT
+                			source_system as i_source_system,
+                			game_id as i_game_id,
+                			server_id as i_server_id,
+                			server_name
+                		FROM dm_game_order.t_game_server_merge
+                	) i on a.source_system = i.i_source_system AND a.server_id = i.i_server_id AND a.super_game_id = i.i_game_id
                 	GROUP BY source_system,server_id,boss_server_id,super_game_id
                 ) a
                 """;
@@ -2115,7 +2124,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                     		super_game_id , -- 超父游戏ID
                     		MAX(super_game_name) as super_game_name , -- 超父游戏名
                     		server_id, -- 区服ID
-                    		IFNULL(MAX(h.server_name), MAX(a.server_name)) as server_name, -- 区服名
+                    		IFNULL(MAX(i.server_name), MAX(a.server_name)) as server_name, -- 区服名
                     		MAX(dt) as dt, -- 开服日期
                     		TIMESTAMPDIFF(DAY, MAX(dt), NOW()) start_day, -- 开服天数
                     		boss_server_id, -- 合服ID
@@ -2326,6 +2335,14 @@ public class RoleManageServiceImpl implements IRoleManageService {
                     			is_merge -- 是否参与过合服
                     		FROM dm_game_order.t_game_server_merge
                     	) h on a.source_system = h.h_source_system AND a.boss_server_id = h.h_server_id AND a.super_game_id = h.h_game_id
+                    	LEFT JOIN (
+                    		SELECT
+                    			source_system as i_source_system,
+                    			game_id as i_game_id,
+                    			server_id as i_server_id,
+                    			server_name
+                    		FROM dm_game_order.t_game_server_merge
+                    	) i on a.source_system = i.i_source_system AND a.server_id = i.i_server_id AND a.super_game_id = i.i_game_id
                     	GROUP BY source_system,server_id,boss_server_id,super_game_id
                     ) a
                 """ + cri+