From 332bcbff4120f43a1916a246dab446902a765825 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 22 Jan 2013 17:34:38 +0000 Subject: [PATCH] =?UTF-8?q?corre=C3=A7=C3=A3o=20do=20caso=20de=20uso=20338?= =?UTF-8?q?7=20relacionado=20ao=20filtro=20por=20empresa=20associada=20ao?= =?UTF-8?q?=20usu=C3=A1rio?= 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@23810 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/MarcaDAO.java | 2 +- .../dao/hibernate/MarcaHibernateDAO.java | 22 ++++++++++++------- .../ventaboletos/service/MarcaService.java | 2 +- .../service/impl/MarcaServiceImpl.java | 4 ++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/MarcaDAO.java b/src/com/rjconsultores/ventaboletos/dao/MarcaDAO.java index e922da92b..1a1cfe2b4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/MarcaDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/MarcaDAO.java @@ -18,7 +18,7 @@ public interface MarcaDAO extends GenericDAO { public List buscarPorNome(String nomeMarca); - public List buscarTodosExceto(Integer... idMarca); + public List buscarTodosExceto(Usuario usuario,Integer... idMarca); public List buscarDescricaoIdMarca(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java index 834a7fc44..22f26e336 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java @@ -53,14 +53,20 @@ public class MarcaHibernateDAO extends GenericHibernateDAO return c.list(); } - public List buscarTodosExceto(Integer... idMarca) { - Criteria c = this.makeCriteria(); - for (Integer id : idMarca) { - c.add(Restrictions.ne("marcaId", id.shortValue())); - } - c.add(Restrictions.eq("activo", Boolean.TRUE)); - c.addOrder(Order.asc("descmarca")); - return c.list(); + public List buscarTodosExceto(Usuario usuario, Integer... idMarca) { + String hql = " select new com.rjconsultores.ventaboletos.entidad.Marca(marca.marcaId, marca.descmarca) from Marca marca, UsuarioEmpresa ue" + + " where marca.empresa = ue.empresa and ue.usuarioLog := usuarioId "; + + for(Integer marca: idMarca){ + + hql = hql + " and marca.marcaId <> "+ marca.shortValue(); + + } + + Query sq = getSession().createQuery(hql); + sq.setParameter("usuarioId", usuario.getUsuarioId()); + List lsMarca = sq.list(); + return lsMarca; } diff --git a/src/com/rjconsultores/ventaboletos/service/MarcaService.java b/src/com/rjconsultores/ventaboletos/service/MarcaService.java index 5d2b93e0e..a24beb18b 100644 --- a/src/com/rjconsultores/ventaboletos/service/MarcaService.java +++ b/src/com/rjconsultores/ventaboletos/service/MarcaService.java @@ -18,7 +18,7 @@ public interface MarcaService extends GenericService { public List buscarPorNome(String nomeMarca); - public List buscarTodosExceto(Integer ... idMarca); + public List buscarTodosExceto(Usuario usuario,Integer ... idMarca); public List buscarDescricaoIdMarca(); diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MarcaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/MarcaServiceImpl.java index 0b5be27b0..49edd8e71 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/MarcaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/MarcaServiceImpl.java @@ -65,8 +65,8 @@ public class MarcaServiceImpl implements MarcaService { return marcaDAO.buscarPorNome(nomeMarca); } - public List buscarTodosExceto(Integer... idMarca) { - return marcaDAO.buscarTodosExceto(idMarca); + public List buscarTodosExceto(Usuario usuario,Integer... idMarca) { + return marcaDAO.buscarTodosExceto(usuario,idMarca); } @Override