From 24af4d8f9fcff9df2c484e0ee299aa1e2fb25048 Mon Sep 17 00:00:00 2001 From: valdevir Date: Tue, 15 Dec 2020 13:42:33 +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@104726 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../EmbarcadaDispOperadorHibernateDAO.java | 14 ++++++++------ .../dao/hibernate/UsuarioHibernateDAO.java | 6 ++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java index d52ea7a13..c15f3d0d8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java @@ -80,15 +80,17 @@ public class EmbarcadaDispOperadorHibernateDAO extends GenericHibernateDAO buscarEmbarcadaDispOperadorPorDispositivo(Long dispositivoEmbarcadaId) { StringBuilder sQuery = new StringBuilder(); - sQuery.append("select EMBARCADADISPOPERADOR_ID as embarcadaDispOperador, ") - .append(" DISPOSITIVOEMBARCADA_ID as dispositivoEmbarcadaId, ") - .append(" USUARIO_ID as usuarioId, ") - .append(" PUNTOVENTA_ID as puntoVentaId, ") - .append(" ACTIVO as activo ") + sQuery.append("select embdispop.EMBARCADADISPOPERADOR_ID as embarcadaDispOperador, ") + .append(" embdispop.DISPOSITIVOEMBARCADA_ID as dispositivoEmbarcadaId, ") + .append(" embdispop.USUARIO_ID as usuarioId, ") + .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(" where ") .append(" embdispop.dispositivoembarcada_id = :dispositivoEmbarcadaId ") - .append(" and embdispop.activo = 1 "); + .append(" and embdispop.activo = 1 ") + .append(" and embsinc.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 19eaf2471..4f8564f4d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java @@ -222,17 +222,19 @@ public class UsuarioHibernateDAO extends GenericHibernateDAO i @Override public List buscaUsuariosDoPuntoVenta(Long puntoventaId){ StringBuilder sQuery = new StringBuilder(); - sQuery.append(" select u.usuario_id as usuarioId, " ); + sQuery.append(" select distinct u.usuario_id as usuarioId, " ); sQuery.append(" u.nombusuario as nome, " ); sQuery.append(" u.cveusuario as cveusuario, "); sQuery.append(" desccontrasena as senha, "); 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(" 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(" 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 "); Query qr = getSession().createSQLQuery(sQuery.toString()) .addScalar("usuarioId", new LongType()) .addScalar("nome", new StringType())