From 563339a9cfc4c047add9d1f8d22b6cc96bc7c9a8 Mon Sep 17 00:00:00 2001
From: valdevir <valdevir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 15 Dec 2020 18:58:39 +0000
Subject: [PATCH] =?UTF-8?q?fixes=20bug#21228=20qua:=20dev:Aristides=20Impl?=
 =?UTF-8?q?ementado=20filtro=20para=20n=C3=A3o=20trazer=20usu=C3=A1rio=20q?=
 =?UTF-8?q?ue=20n=C3=A3o=20tenha=20cadastro=20do=20cadastro=20de=20operado?=
 =?UTF-8?q?r=20EMBARCADA=5FSINCRONISMO.?=
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@104741 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java      | 4 ++--
 .../ventaboletos/dao/hibernate/UsuarioHibernateDAO.java       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java
index c15f3d0d8..2900054cb 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java
@@ -86,11 +86,11 @@ public class EmbarcadaDispOperadorHibernateDAO extends GenericHibernateDAO<Embar
 				.append(" embdispop.PUNTOVENTA_ID as puntoVentaId, ")
 				.append(" embdispop.ACTIVO as activo ")
 				.append(" from embarcada_disp_operador embdispop ")
-				.append(" JOIN EMBARCADA_SINCRONISMO embsinc ON (embdispop.USUARIO_ID = embsinc.USUARIO_ID) ")
+				.append(" JOIN OPERADOR_EMBARCADA opeEmb ON (embdispop.USUARIO_ID = opeEmb.USUARIO_ID) ")
 				.append(" where  ")
 				.append(" embdispop.dispositivoembarcada_id = :dispositivoEmbarcadaId ")
 				.append(" and embdispop.activo = 1 ")
-				.append(" and embsinc.activo = 1 ");
+				.append(" and opeEmb.activo = 1 ");
 		Query qr = getSession().createSQLQuery(sQuery.toString())
 				.addScalar("embarcadaDispOperador", new LongType())
 				.addScalar("dispositivoEmbarcadaId", new LongType())
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java
index 4f8564f4d..0a5737fec 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java
@@ -229,12 +229,12 @@ public class UsuarioHibernateDAO extends GenericHibernateDAO<Usuario, Integer> i
 		sQuery.append(" desccorreo as email ");
 		sQuery.append(" from usuario u ");
 		sQuery.append(" left join usuario_ubicacion uu on (uu.usuario_id = u.usuario_id) "); 
-		sQuery.append(" join EMBARCADA_SINCRONISMO embsinc  ON (u.USUARIO_ID = embsinc.USUARIO_ID) ");
+		sQuery.append(" join OPERADOR_EMBARCADA operEmb  ON (u.USUARIO_ID = operEmb.USUARIO_ID) ");
 		sQuery.append(" where ");
 		sQuery.append(" uu.puntoventa_id = :puntoventaId ");
 		sQuery.append(" and uu.activo = 1 ");
 		sQuery.append("	and u.activo = 1 ");
-		sQuery.append("	and embsinc.activo = 1 ");
+		sQuery.append("	and operEmb.activo = 1 ");
 		Query qr = getSession().createSQLQuery(sQuery.toString())
 				.addScalar("usuarioId", new LongType())
 		        .addScalar("nome", new StringType())