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

fixes bug#16117 

dev:
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@97931 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.clemente 2019-09-27 21:31:34 +00:00
parent dc3aa418a8
commit 001b6530c3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaCatalogoDeRutaController.java
View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -41,7 +42,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCatalogoDeRutas;
import com.trg.search.Filter;
/**
*
@ -166,7 +166,11 @@ public class BusquedaCatalogoDeRutaController extends MyGenericForwardComposer {
if (cmbEmpresa.getSelectedIndex() >= 0) {
Empresa e = (Empresa) cmbEmpresa.getSelectedItem().getValue();
rutaBusqueda.addFilterAll("lsRutaEmpresa", Filter.equal("empresa.empresaId", e.getEmpresaId()));
// Mantis 16117 - addFilterAll estava criando um NOT EXISTS
// AND NOT (EXISTS (SELECT lsrutaempr1_.RUTAEMPRESA_ID FROM RUTA_EMPRESA lsrutaempr1_ WHERE ruta0_.RUTA_ID=lsrutaempr1_.RUTA_ID AND (lsrutaempr1_.EMPRESA_ID<>? OR lsrutaempr1_.EMPRESA_ID IS NULL)))
// rutaBusqueda.addFilterAll("lsRutaEmpresa", Filter.equal("empresa.empresaId", e.getEmpresaId()));
rutaBusqueda.addFilterIn("lsRutaEmpresa.empresa.empresaId", Arrays.asList(e.getEmpresaId()));
rutaBusqueda.addFilterEqual("lsRutaEmpresa.activo", Boolean.TRUE);
} else {
rutaBusqueda.addFilterIn("lsRutaEmpresa.empresa.empresaId", getIdEmpresas(lsEmpresa));