|  | @@ -167,10 +167,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
 | 
											
												
													
														|  |          if (dto.getIsMergeServer() != null) {
 |  |          if (dto.getIsMergeServer() != null) {
 | 
											
												
													
														|  |              isQueryMerge = dto.getIsMergeServer();
 |  |              isQueryMerge = dto.getIsMergeServer();
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | -        //是否查询超父游戏数据(默认查询父游戏数据)
 |  | 
 | 
											
												
													
														|  | -        Boolean isSuperParentGame = false;
 |  | 
 | 
											
												
													
														|  | -        if (dto.getSuperParentGameId() != null) {
 |  | 
 | 
											
												
													
														|  | -            isSuperParentGame = true;
 |  | 
 | 
											
												
													
														|  | 
 |  | +        //是否查询超父游戏数据(默认查询超父游戏数据)
 | 
											
												
													
														|  | 
 |  | +        Boolean isSuperParentGame = true;
 | 
											
												
													
														|  | 
 |  | +        if (dto.getParentGameId() != null) {
 | 
											
												
													
														|  | 
 |  | +            isSuperParentGame = false;
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          //查询区服相关数据
 |  |          //查询区服相关数据
 | 
											
												
													
														|  |          if (isQueryMerge) {
 |  |          if (isQueryMerge) {
 |