From c9a449094783ef90b1bbdcf3aa167cf062e9a0a9 Mon Sep 17 00:00:00 2001
From: celio <celio@rjconsultores.com.br>
Date: Tue, 16 May 2023 17:29:03 -0300
Subject: [PATCH] fixes bug#AL-2679

---
 pom.xml                                                       | 2 +-
 .../ventaboletos/relatorios/impl/RelatorioPassagensAGR.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef4565e5a..ba3ccdc07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.5.2</version>
+	<version>1.5.3</version>
 	<packaging>war</packaging>
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
index caddd49a0..08f033613 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
@@ -298,7 +298,7 @@ public class RelatorioPassagensAGR extends Relatorio {
 			sql.append("    AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda 	");
 		}
 			
-		if (!categoriaIds.isEmpty() || !categoriaIds.equals("Todas") ) {
+		if (!categoriaIds.isEmpty() && !categoriaIds.equals("Todas") ) {
 			sql.append("	AND b.categoria_id in ( "+categoriaIds+" ) 						");	
 		}
 
@@ -306,7 +306,7 @@ public class RelatorioPassagensAGR extends Relatorio {
 			sql.append("    AND b.fechorviaje BETWEEN :fecInicioViagem AND :fecFinalViagem ");
 		}
 
-		if (!empresa.isEmpty() || !empresa.equals("Todas")){
+		if (!empresa.isEmpty()){
 			sql.append("	AND b.empresacorrida_id =:empresa_id  							");
 		}