|  | @@ -189,12 +189,15 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          //合服原始服列表
 | 
	
		
			
				|  |  |          if (sourceServerIdArray != null) {
 | 
	
		
			
				|  |  | +            List<Integer> sourceServerIdList = Arrays.stream(sourceServerIdArray)
 | 
	
		
			
				|  |  | +                    .map(Integer::parseInt)
 | 
	
		
			
				|  |  | +                    .sorted().collect(Collectors.toList());
 | 
	
		
			
				|  |  |              List<GameServerListVO.ServerBean> sourceServerList = new ArrayList<>();
 | 
	
		
			
				|  |  | -            for (String sourceServerId : sourceServerIdArray) {
 | 
	
		
			
				|  |  | -                GameServer sourceServer = gameServerMap.get(sourceServerId);
 | 
	
		
			
				|  |  | +            for (Integer sourceServerId : sourceServerIdList) {
 | 
	
		
			
				|  |  | +                GameServer sourceServer = gameServerMap.get(sourceServerId.toString());
 | 
	
		
			
				|  |  |                  if (sourceServer != null) {
 | 
	
		
			
				|  |  |                      sourceServerList.add(GameServerListVO.ServerBean.builder()
 | 
	
		
			
				|  |  | -                            .serverId(sourceServerId)
 | 
	
		
			
				|  |  | +                            .serverId(sourceServerId.toString())
 | 
	
		
			
				|  |  |                              .serverName(sourceServer.getServerName())
 | 
	
		
			
				|  |  |                              .build());
 | 
	
		
			
				|  |  |                  }
 |