fixes bug#21228

qua:
dev:Aristides
Implementado filtro para não trazer usuário que não tenha cadastro do cadastro de operador EMBARCADA_SINCRONISMO.

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@104726 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdevir 2020-12-15 13:42:33 +00:00
parent d16c64c630
commit 24af4d8f9f
2 changed files with 12 additions and 8 deletions

View File

@ -80,15 +80,17 @@ public class EmbarcadaDispOperadorHibernateDAO extends GenericHibernateDAO<Embar
@Override
public List<EmbarcadaDispOperador> 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())

View File

@ -222,17 +222,19 @@ public class UsuarioHibernateDAO extends GenericHibernateDAO<Usuario, Integer> i
@Override
public List<UsuarioEmbarcadaVO> 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())