fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@33755 d1611594-4594-4d17-8e1d-87c2c4800839

master
gleimar 2014-02-19 19:16:35 +00:00
parent 2c5cca9d47
commit ff8bda8ee0
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaUsuarioController.java
View File

@ -216,18 +216,23 @@ public class BusquedaUsuarioController extends MyGenericForwardComposer {
Filter.equal("activo", true)));
}
Filter filterEmpresas = Filter.in("empresa", lsEmpresas);
List<Empresa> lsEmpresaTmp =null;
Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
if (itemEmpresa != null) {
Empresa empresa = (Empresa) itemEmpresa.getValue();
filterEmpresas = Filter.equal("empresa", empresa);
lsEmpresaTmp = new ArrayList<Empresa>();
lsEmpresaTmp.add(empresa);
}else{
lsEmpresaTmp = lsEmpresas;
}
Filter filterEmpresasVazias = Filter.isEmpty("usuarioEmpresaList")
.and(Filter.or(filterEmpresas, Filter.equal("activo", Boolean.TRUE)));
sistemaBusqueda.addFilter(Filter.and(Filter.or(
Filter.some("usuarioEmpresaList",
Filter.and(Filter.in("empresa", lsEmpresaTmp),
Filter.equal("activo", true))),
Filter.isEmpty("usuarioEmpresaList"))));
sistemaBusqueda.addFilterAll("usuarioEmpresaList",filterEmpresasVazias);
Comboitem puntoVentaSeleccionada = cmbPuntoVenta.getSelectedItem();

2
src/java/versionADM.info
View File

@ -1 +1 @@
ADM_20140218_1RC316
ADM_20140219_1RC317