From 846c5bd4983bdfb9cdac26add12fe2f7bbb7c1ef Mon Sep 17 00:00:00 2001
From: "daniel.zauli" <daniel.zauli@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 2 Dec 2015 11:35:31 +0000
Subject: [PATCH] FIXES BUG #6876

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@50846 d1611594-4594-4d17-8e1d-87c2c4800839
---
 ...ditarConfRestricaoCanalVentaController.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java
index d8c34c313..1b37f474e 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java
@@ -195,12 +195,19 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
 		List<ConfRestricaoCanalVenta> ls = new ArrayList<ConfRestricaoCanalVenta>() ;
 		
 		for (int i = 0;  i < confRestricaoCanalVentaList.getData().length; i++){
-			ConfRestricaoCanalVenta listElement = (ConfRestricaoCanalVenta)confRestricaoCanalVentaList.getData()[i];
-			if(isConfRestricaoCanalVentasEquivalentes(c , listElement)){
-				return true;
+			ConfRestricaoCanalVenta elementList = (ConfRestricaoCanalVenta)confRestricaoCanalVentaList.getData()[i];
+			if(c.getConfRestricaoCanalVentaId() == null){
+				if(isConfRestricaoCanalVentasEquivalentes(c , elementList)){
+					return true;
+				}
+			}else{
+				if(!c.getConfRestricaoCanalVentaId().equals(elementList.getConfRestricaoCanalVentaId())){
+					isConfRestricaoCanalVentasEquivalentes(c , elementList);
+				}else{
+					continue;
+				}
 			}
 		}
-		
 		return false;
 	}
 	
@@ -216,8 +223,7 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
 				&& isIntercessaoDiasSemana(a,b)
 				){
 			return true;
-		}
-		if(a.getRuta().equals(b.getRuta()) 
+		}else if(a.getRuta().equals(b.getRuta()) 
 				&& a.getTipoPuntoVenta().equals(b.getTipoPuntoVenta()) 
 				&& a.getCorridaId().equals(b.getCorridaId()) 
 				&& a.getOrigem().equals(b.getOrigem())