From c0896aae136de7baceb7b4b07d65f2a77251c665 Mon Sep 17 00:00:00 2001
From: "valdir.cordeiro" <valdir.cordeiro@BHN330100045.bh01.local>
Date: Fri, 21 Jul 2023 17:16:17 -0300
Subject: [PATCH] =?UTF-8?q?bug#al-2980=20=C3=81guia=20Branca=20-=20GLPI=20?=
 =?UTF-8?q?65710=20[PROJETO]=20-=20PRICING=20CONEXAO=20-=20ERRO=20AO=20GRA?=
 =?UTF-8?q?VAR=20PRICING=20COM=20CONEXAO=20ASSOCIADA=20EM=20HMG=20dev:=20q?=
 =?UTF-8?q?ua:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Acertando validação de origem e destino de conexao do pricing
---
 pom.xml                                       |  2 +-
 .../pricing/EditarPricingController.java      | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9acfa1bee..aa998cd21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.10.4</version>
+	<version>1.10.5</version>
 	<packaging>war</packaging>
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
index eb999f548..7e84fb146 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
@@ -2661,30 +2661,29 @@ public class EditarPricingController extends PricingController {
 		
 		paradasConexao = new ArrayList<>();
 		
+		List<String> combinacaoParadas = new ArrayList<>();
+		
 		clearCombobox(cmbConexaoCtrl);
 		for (ConexionCtrl p :lsConexoesCtrlList) {
 			Parada paradaOrigem = paradaService.obtenerID(p.getOrigenId());
 			Parada paradaDestino = paradaService.obtenerID(p.getDestinoId());
 			
-			Boolean origem = false, destino = false;
-			
 			if(!paradasConexao.contains(paradaOrigem)) {
 				paradasConexao.add(paradaOrigem);
-			} else {
-				origem = true;
-			}
+			} 
 			
 			if(!paradasConexao.contains(paradaDestino)) {
 				paradasConexao.add(paradaDestino);
-			} else {
-				destino = true;
-			}
+			} 
 			
-			//Se ja foi adicionado a origem e destino nao mostra novamente.
-			if(origem && destino) {
+			String combinacao = p.getOrigenId() + "-" + p.getDestinoId();
+			
+			if(combinacaoParadas.contains(combinacao)) {
 				continue;
 			}
 			
+			combinacaoParadas.add(combinacao);
+			
 			Comboitem comboItem = new Comboitem(paradaOrigem.getDescparada() + " -> " + paradaDestino.getDescparada());
 			comboItem.setValue(p);
 			comboItem.setParent(cmbConexaoCtrl);