修改内容：游戏列表接口;角色战力排行榜修改

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

@@ -28,10 +28,29 @@ public class GameListServiceImpl implements IGameListService {
         //查询游戏列表
         Sql gameListSql = Sqls.create("""
                 SELECT
-                	game_name ,
-                	id
-                FROM dm_game_order.t_game
-                WHERE source_system = 'ZX_ONE';
+                	id,
+                	game_name,
+                	parent_game_id,
+                	parent_game_name,
+                	super_game_id,
+                	super_game_name
+                FROM (
+                	SELECT
+                		a.source_system ,
+                		a.id,
+                		a.game_name,
+                		IFNULL(a.parent_id, a.id) as parent_game_id ,
+                		IFNULL(b.game_name, a.game_name ) as parent_game_name,
+                		IFNULL(a.super_game_id, a.id) as super_game_id ,
+                		IFNULL(c.name, a.game_name ) as super_game_name
+                	FROM dm_game_order.t_game a
+                	LEFT JOIN dm_game_order.t_game b
+                	on a.source_system = b.source_system AND a.parent_id = b.id
+                	LEFT JOIN dm_game_order.t_game_super c
+                	on a.source_system = c.source_system AND a.super_game_id = c.id
+                ) a
+                WHERE a.source_system = 'ZX_ONE'
+                GROUP BY id, game_name, parent_game_id, source_system, parent_game_name, super_game_id, super_game_name;
                 """);
         gameListSql.setCallback(Sqls.callback.maps());
         dao.execute(gameListSql);
@@ -40,18 +59,24 @@ public class GameListServiceImpl implements IGameListService {
         Sql parentGameListSql = Sqls.create("""
                 SELECT
                 	parent_game_id,
-                	parent_game_name
+                	parent_game_name,
+                	super_game_id,
+                	super_game_name
                 FROM (
                 	SELECT
                 		a.source_system ,
                 		IFNULL(a.parent_id, a.id) as parent_game_id ,
-                		IFNULL(b.game_name, a.game_name ) as parent_game_name
+                		IFNULL(b.game_name, a.game_name ) as parent_game_name,
+                		IFNULL(a.super_game_id, a.id) as super_game_id ,
+                		IFNULL(c.name, a.game_name ) as super_game_name
                 	FROM dm_game_order.t_game a
                 	LEFT JOIN dm_game_order.t_game b
                 	on a.source_system = b.source_system AND a.parent_id = b.id
+                	LEFT JOIN dm_game_order.t_game_super c
+                	on a.source_system = c.source_system AND a.super_game_id = c.id
                 ) a
                 WHERE a.source_system = 'ZX_ONE'
-                GROUP BY parent_game_id, source_system, parent_game_name;
+                GROUP BY parent_game_id, source_system, parent_game_name, super_game_id, super_game_name;
                 """);
         parentGameListSql.setCallback(Sqls.callback.maps());
         dao.execute(parentGameListSql);

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

@@ -154,8 +154,8 @@ public class RoleManageServiceImpl implements IRoleManageService {
     @Override
     public Page<Map> getRoleCombatRanking(RoleCombatRankingDTO dto) {
 
-        //是否查询合服数据(默认查询合服数据)
-        Boolean isQueryMerge = dto.getIsMergeServer() == null || dto.getIsMergeServer();
+        //是否查询合服数据(默认查询不合服数据)
+        Boolean isQueryMerge = dto.getIsMergeServer() != null && dto.getIsMergeServer();
         //是否查询超父游戏数据（默认查询父游戏数据）
         Boolean isSuperParentGame = dto.getIsSuperParentGame() != null && dto.getIsSuperParentGame();
         //查询区服相关数据