Commit 33d70525511544a8fea926234f18c1e5877650a6
1 parent
c62ccf09
Exists in
master
redmine #2064 matricula na busca de colaborador termo
Showing
1 changed file
with
4 additions
and
1 deletions
Show diff stats
cit-tabelas-corp-api/src/main/java/br/com/centralit/api/dao/impl/ColaboradorDaoHibernate.java
| @@ -11,6 +11,7 @@ import br.com.centralit.framework.dao.arquitetura.SearchSeven; | @@ -11,6 +11,7 @@ import br.com.centralit.framework.dao.arquitetura.SearchSeven; | ||
| 11 | import br.com.centralit.framework.model.Dominio; | 11 | import br.com.centralit.framework.model.Dominio; |
| 12 | import br.com.centralit.framework.model.Usuario; | 12 | import br.com.centralit.framework.model.Usuario; |
| 13 | 13 | ||
| 14 | +import com.googlecode.genericdao.search.Filter; | ||
| 14 | import com.googlecode.genericdao.search.Sort; | 15 | import com.googlecode.genericdao.search.Sort; |
| 15 | 16 | ||
| 16 | /** | 17 | /** |
| @@ -98,7 +99,9 @@ public class ColaboradorDaoHibernate extends CitGenericDAOImpl implements Colabo | @@ -98,7 +99,9 @@ public class ColaboradorDaoHibernate extends CitGenericDAOImpl implements Colabo | ||
| 98 | 99 | ||
| 99 | SearchSeven search = new SearchSeven(); | 100 | SearchSeven search = new SearchSeven(); |
| 100 | 101 | ||
| 101 | - search.addFilterILike("pessoa.nome", "%" + nome + "%"); | 102 | + //search.addFilterILike("pessoa.nome", "%" + nome + "%"); |
| 103 | + | ||
| 104 | + search.addFilterOr(Filter.ilike("pessoa.nome", "%" + nome + "%"), Filter.ilike("matricula", "%"+nome+"%")); | ||
| 102 | 105 | ||
| 103 | search.addFilterEqual("pessoa.organizacao.id", idOrganizacao); | 106 | search.addFilterEqual("pessoa.organizacao.id", idOrganizacao); |
| 104 | 107 |