From a6a6f3c738ceaf1edcf53ac2360d6772ad0d3af0 Mon Sep 17 00:00:00 2001
From: valdevir <valdevir.silva@totvs.com.br>
Date: Wed, 24 May 2023 14:59:24 -0300
Subject: [PATCH] fixes bug#AL-2543 dev:Valdevir qua:Valdevir

---
 pom.xml                                                     | 2 +-
 .../ventaboletos/dao/hibernate/RutaHibernateDAO.java        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e682a7bf2..619db7695 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.4.3</version>
+	<version>1.4.4</version>
 	<distributionManagement>
         <repository>
             <id>rj-releases</id>
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java
index de06ea925..a9bb45936 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java
@@ -128,7 +128,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
 		Criteria c = getSession().createCriteria(getPersistentClass());
 		c.add(Restrictions.eq("activo", Boolean.TRUE));
 		c.add(Restrictions.ne("rutaId", -1));
-
+		c.add(Restrictions.not(Restrictions.eq("indRutaCancelada", Boolean.TRUE)));
 		if (empresa.getEmpresaId() != -1) {
 			c.createCriteria("lsRutaEmpresa").add(Restrictions.eq("empresa", empresa)).add(Restrictions.eq("activo", Boolean.TRUE));
 		}
@@ -242,7 +242,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
 		return qry.list();
 	}
 
-	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) { // busca rutas e pedágios
+	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) { // busca rutas e ped�gios
 		StringBuffer hql = new StringBuffer();
 		hql.append("select distinct r FROM  Ruta  r left join  r.rutaSecuenciaList rSeqList  ");
 		hql.append(" left join  rSeqList.lsRutaCase casRutaList  ");
@@ -342,7 +342,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
 			}
 
 			try {
-				// Pode cair na exception caso ja possua tarifa criada para o tramo, e nao é necessaria criar novamente
+				// Pode cair na exception caso ja possua tarifa criada para o tramo, e nao � necessaria criar novamente
 				
 				qryList = new ArrayList<String>();
 				qry = new StringBuilder(" update TARIFA set TRAMO_ID = :nuevoTramo, ");