diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java index 0339a90..438ed98 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java @@ -10,6 +10,7 @@ import javax.persistence.FetchType; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.criterion.DetachedCriteria; +import org.hibernate.criterion.Order; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Subqueries; @@ -296,21 +297,25 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD @Override public Collection autoCompleteProcessoEmAndamentoByNup(String nup) { - Search search = new SearchSeven(this.persistentClass); + Criteria criteriaProcesso = this.newCriteria(Processo.class); - search.addFilterOr(Filter.ilike("nup", "%" + nup + "%"), Filter.ilike("nup", "%" + nup + "%")); + criteriaProcesso.add(Restrictions.ilike("nup", "%" + nup + "%")); - search.getFilters().add(Filter.notEqual("status.codigo", 1L)); + criteriaProcesso.createAlias("status", "status", JoinType.LEFT_OUTER_JOIN); - search.getFilters().add(Filter.notEqual("status.codigo", 5L)); + criteriaProcesso.add(Restrictions.not(Restrictions.eq("status.codigo", 1L))); - search.getFilters().add(Filter.notEqual("status.codigo", 3L)); + criteriaProcesso.add(Restrictions.not(Restrictions.eq("status.codigo", 5L))); - search.addSortDesc("id"); + criteriaProcesso.add(Restrictions.not(Restrictions.eq("status.codigo", 3L))); - search.setMaxResults(10); + this.filterProcessoPermissaoUsuario(criteriaProcesso); - return this.search(search); + criteriaProcesso.addOrder(Order.desc("id")); + + criteriaProcesso.setMaxResults(10); + + return criteriaProcesso.list(); } @Override -- libgit2 0.21.2