From de77e5c60823a93b280a64c16dac0dbda020deca Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 11 May 2015 19:32:58 +0000 Subject: [PATCH] =?UTF-8?q?Diverg=C3=AAncia=20Relat=C3=B3rio=20Empresa=20?= =?UTF-8?q?=C3=B4nibus=20x=20Empresa=20Corrida=20(bug=20#6270)?= 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/Web/trunk/ventaboletos@43906 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java index 10315289a..1a54954f9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java @@ -111,7 +111,7 @@ public class RelatorioEmpresaCorrida extends Relatorio { sql.append(" INNER JOIN empresa e ON e.empresa_id = a.empresa_id "); sql.append(" WHERE c.activo <> 0 "); sql.append(" AND ct.activo = 1 "); - sql.append(" AND e.empresa_id = 1 "); + sql.append(StringUtils.isBlank(empresa) ? "" : "AND e.empresa_id = :empresa_id "); sql.append(" AND c.FECCORRIDA BETWEEN :fecInicio AND :fecFinal "); sql.append(" GROUP BY c.ruta_id, e.empresa_id, e.nombempresa) km2 "); sql.append("ON r.ruta_id = km2.ruta_id AND re.empresa_id = km2.empresa_id ");