From 20f65f315771a82a918393693ad67648d063c17e Mon Sep 17 00:00:00 2001
From: "eduardo.dicarde" <eduardo.dicarde@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 6 Apr 2016 18:08:08 +0000
Subject: [PATCH] fixes bug #7326

Artefatos Alterados:
    RutaCombinacionHibernateDAO

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@54688 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/RutaCombinacionHibernateDAO.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
index bf48979d4..dcbebefa3 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
@@ -345,7 +345,7 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO<RutaCombina
             String listInt = sb.toString().substring(0, sb.toString().length() - 1);
             hql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") ");
         }
-        if (!lsClaseServicio.isEmpty()) {
+        if (!lsClaseServicio.isEmpty() && !lsClaseServicio.toString().contains("TODAS")) {
             StringBuilder sb = new StringBuilder("");
             for (ClaseServicio cs : lsClaseServicio) {
                 sb.append(cs.getClaseservicioId()).append(",");
@@ -353,7 +353,7 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO<RutaCombina
             String listInt = sb.toString().substring(0, sb.toString().length() - 1);
             hql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") ");
         }
-        if (!lsOrgaoConcedente.isEmpty()) {
+        if (!lsOrgaoConcedente.isEmpty() && !lsOrgaoConcedente.toString().contains("TODOS")) {
             StringBuilder sb = new StringBuilder("");
             for (OrgaoConcedente oc : lsOrgaoConcedente) {
                 sb.append(oc.getOrgaoConcedenteId()).append(",");