From b12234dd979263df6f205f9791d0598c776528a9 Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 10 Jun 2016 18:02:46 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7538=20-=20corre=C3=A7=C3=A3o=20?=
 =?UTF-8?q?Tarifa=20Oficial=20Excel:=20n=C3=A3o=20era=20tratado=20ruta=20'?=
 =?UTF-8?q?-1=20TODAS'=20nem=20excel=20sem=20dados?=
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@56872 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/RutaCombinacionHibernateDAO.java           | 2 ++
 .../service/impl/RutaCombinacionServiceImpl.java             | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
index 1966fc4e5..ec464f336 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
@@ -663,7 +663,9 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO<RutaCombina
                 sb.append(vt.getRutaId()).append(",");
             }
             String listInt = sb.toString().substring(0, sb.toString().length() - 1);
+            if(!listInt.contains("-1")){
             sql.append("  AND RC.RUTA_ID in (").append(listInt).append(")");
+            }
         }
         if (!lsMarca.isEmpty()) {
             StringBuilder sb = new StringBuilder("");
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java
index f80dafd30..6dd3fd911 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java
@@ -278,7 +278,10 @@ public class RutaCombinacionServiceImpl implements RutaCombinacionService {
         //Bucando todas as Linhas com Clase Marca e Moeda Separadamente
         List<TarifaOficialEscalaGroupVO> lsLinhasAgrupadas = rutaCombinacionDAO.pesquisaTarifaOficialGroupObj(lsAddRmvMonedas, lsAddRmvMarcas, lsAddRmvClaseServico,
                 lsAddRmvEmpresas, lsAddRmvRutas, lsAddRmvVigenciaTarifa);
-
+        
+        if(lsLinhasAgrupadas == null || lsLinhasAgrupadas.isEmpty()){
+        	return null;
+        }
 
         HSSFSheet sheet1 = null;