From 2bbb071293c62ebfbb67a1115aad8d172df39f91 Mon Sep 17 00:00:00 2001 From: walace Date: Thu, 10 Oct 2019 14:54:08 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug#16328=20qua:wallyson=20dev:=20Inser?= =?UTF-8?q?ido=20o=20filtro=20de=20marca=20tamb=C3=A9m=20na=20consulta=20e?= =?UTF-8?q?xterna,=20a=20consulta=20interna=20retornava=20mais=20de=20um?= =?UTF-8?q?=20resultado?= 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/Model/trunk/modelWeb@98196 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java index ef019ccb6..f013d8115 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -604,7 +604,7 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); - sb.append(" and m.empresa_id in ("+obtemEmpresas(idsEmpresas)+" ) "); + sb.append(" and m.empresa_id in ("+obtemEmpresas(idsEmpresas)+" ) and tao.activo = 1 "); sb.append("),IMPORTETAXAEMBARQUE) "); sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); sb.append(" "); @@ -616,6 +616,7 @@ public class SQLBuilderOracle implements SQLBuilder { if (orgaoConcedenteId != null) { sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); } + sb.append(" and tarifa_oficial.MARCA_ID in (" +obtemEmpresas(idsEmpresas)+ " ) "); return sb.toString(); }