From 2a3a84356a122bc0cd3945db3cd9c04248705857 Mon Sep 17 00:00:00 2001
From: "thiago.clemente" <thiago.clemente@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 26 Aug 2020 18:02:29 +0000
Subject: [PATCH] fixes bug#20230 dev:valdevir qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@103046 d1611594-4594-4d17-8e1d-87c2c4800839
---
 src/com/rjconsultores/ventaboletos/dao/EstacionSitefDAO.java  | 2 +-
 .../ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java | 4 +++-
 .../ventaboletos/service/EstacionSitefService.java            | 2 +-
 .../ventaboletos/service/impl/EstacionSitefServiceImpl.java   | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/EstacionSitefDAO.java b/src/com/rjconsultores/ventaboletos/dao/EstacionSitefDAO.java
index 8d1cd61c8..ad770e70c 100644
--- a/src/com/rjconsultores/ventaboletos/dao/EstacionSitefDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/EstacionSitefDAO.java
@@ -17,6 +17,6 @@ public interface EstacionSitefDAO extends GenericDAO<EstacionSitef, Integer> {
 
 	EstacionSitef buscar(Empresa empresa, Integer numempresa, Integer numfilial, String numpdv);
 	
-	public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv);
+	public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv, Integer numfilial);
 	
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java
index f3fa98f89..9abdc81d3 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java
@@ -46,12 +46,14 @@ public class EstacionSitefHibernateDAO extends GenericHibernateDAO<EstacionSitef
 	
 	@SuppressWarnings("unchecked")
 	@Override
-	public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv) {
+	public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv, Integer numfilial) {
 		Criteria c = getSession().createCriteria(getPersistentClass());
 		c.add(Restrictions.eq("empresa", empresa));
 		c.add(Restrictions.or(Restrictions.isNull("tipoIntegracao"), Restrictions.eq("tipoIntegracao", tipoIntegracaoTEF != null ? tipoIntegracaoTEF : TipoIntegracaoTEF.SITEF)));
 		c.add(Restrictions.eq("numpdv", numpdv));
 		c.add(Restrictions.eq("activo", true));
+		c.add(Restrictions.eq("numfilial", numfilial));
+		
 		List<EstacionSitef> estacionsSitef = c.list();
 		return estacionsSitef.isEmpty() ? null : estacionsSitef.get(0);
 	}
diff --git a/src/com/rjconsultores/ventaboletos/service/EstacionSitefService.java b/src/com/rjconsultores/ventaboletos/service/EstacionSitefService.java
index 7e25ebf05..16fe8827b 100644
--- a/src/com/rjconsultores/ventaboletos/service/EstacionSitefService.java
+++ b/src/com/rjconsultores/ventaboletos/service/EstacionSitefService.java
@@ -17,6 +17,6 @@ public interface EstacionSitefService {
 
 	EstacionSitef buscar(Empresa empresa, Integer numempresa, Integer numfilial, String numpdv);
 	
-	public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv);
+	public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv, Integer numfilial);
 
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EstacionSitefServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/EstacionSitefServiceImpl.java
index 9d7b00e8d..92a896a28 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/EstacionSitefServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/EstacionSitefServiceImpl.java
@@ -26,8 +26,8 @@ public class EstacionSitefServiceImpl implements EstacionSitefService {
 	}
 
 	@Override
-	public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv) {
-		return estacionSitefDAO.buscar(empresa, tipoIntegracaoTEF, numpdv);
+	public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv, Integer numfilial) {
+		return estacionSitefDAO.buscar(empresa, tipoIntegracaoTEF, numpdv, numfilial);
 	}
 
 }