From a50190422c79687e6cd7d496b248490d24136a9d Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 1 Aug 2016 20:29:40 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7782=20Copiar/mudar=20vig=C3=AAn?=
 =?UTF-8?q?cia=20-=20habilitada=20op=C3=A7=C3=A3o=20todas=20empresas;=20co?=
 =?UTF-8?q?rrigido=20problema=20de=20duplicidade=20de=20tarifas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@58624 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/dao/hibernate/TarifaHibernateDAO.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java
index ce4b92cb9..67a7d4aec 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java
@@ -157,7 +157,7 @@ public class TarifaHibernateDAO extends GenericHibernateDAO<Tarifa, Integer> imp
 		if (vigencia != null) {
 			c.add(Restrictions.eq("vigenciaTarifa", vigencia));
 		}
-		if (empresa != null) {
+		if (empresa != null && empresa.getEmpresaId() != -1) {
 			c.createCriteria("marca").add(Restrictions.eq("empresa", empresa));
 		}
 
@@ -243,7 +243,7 @@ public class TarifaHibernateDAO extends GenericHibernateDAO<Tarifa, Integer> imp
 						+ "  AND VIGENCIATARIFA_ID = :VIGENCIATARIFAIDDESTINO)");
 			}
 
-			if (empresa != null) {
+			if (empresa != null && empresa.getEmpresaId() != -1) {
 				sQuery.append("  AND marca.EMPRESA_ID = :EMPRESA_ID");
 			}
 
@@ -252,7 +252,7 @@ public class TarifaHibernateDAO extends GenericHibernateDAO<Tarifa, Integer> imp
 			qrInsert.setParameter("VIGENCIATARIFAIDDESTINO", vigenciaTarifaDestino.getVigenciatarifaId());
 			qrInsert.setParameter("USUARIOID", UsuarioLogado.getUsuarioLogado().getUsuarioId());
 
-			if (empresa != null) {
+			if (empresa != null && empresa.getEmpresaId() != -1) {
 				qrInsert.setParameter("EMPRESA_ID", empresa.getEmpresaId());
 			}
 			qrInsert.executeUpdate();