From e6445a54695dceb343e86589a663e87417877b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?=
 <aristides.reis@totvs.com.br>
Date: Fri, 2 Feb 2024 18:38:22 -0300
Subject: [PATCH] fixes bug#AL-3711

---
 pom.xml                                                       | 2 +-
 .../ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java | 2 +-
 .../ventaboletos/service/impl/TarifaOficialServiceImpl.java   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 865ab7f78..f5aae2e6b 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.36.2</version>
+	<version>1.36.3</version>
 
 	<distributionManagement>
         <repository>
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java
index 89dc86a9e..25ec5211a 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java
@@ -549,7 +549,7 @@ public class TarifaOficialHibernateDAO extends GenericHibernateDAO<TarifaOficial
 		sql.append(" AND tof.ACTIVO = 1 ");
 		sql.append(" AND ta.ACTIVO = 1 ) ");
 
-		sql.append(" LEFT JOIN VIGENCIA_TARIFA vg on ta.VIGENCIATARIFA_ID=vg.VIGENCIATARIFA_ID");
+		sql.append(" INNER JOIN VIGENCIA_TARIFA vg on ta.VIGENCIATARIFA_ID=vg.VIGENCIATARIFA_ID");
 		sql.append(" and vg.FECINICIOVIGENCIA<= TO_DATE(:dataInicial,'DD/MM/YYYY hh24:mi') ");
 		sql.append(" and vg.FECFINVIGENCIA>= TO_DATE(:dataFinal,'DD/MM/YYYY hh24:mi')");
 		sql.append(" INNER JOIN PEAJE p");
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java
index b01fb0538..48e68b599 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java
@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -360,12 +361,13 @@ public class TarifaOficialServiceImpl implements TarifaOficialService {
 		List<TarifaOficialComComposicaoDoPedagioVo> lsTarifaOficialComComposicaoDoPedagioVo = tarifaOficialDAO.oberTarifaOficialComComposicaoDoPedagioVo(empresaId);
        
 		if (!lsTarifaOficialComComposicaoDoPedagioVo.isEmpty()) {
+			log.info("tamanho da lsTarifaOficialComComposicaoDoPedagioVo: " + lsTarifaOficialComComposicaoDoPedagioVo.size());
 			
 
 			for (TarifaOficialComComposicaoDoPedagioVo tarifaOficialComComposicaoDoPedagioVo : lsTarifaOficialComComposicaoDoPedagioVo) {
 				log.info("tarifaOficiald:" + tarifaOficialComComposicaoDoPedagioVo.getTarifaOficialId() + " | composicao do pedágio no cálculo:" + tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje() + " | composicao do pedágio na tarifa:" + tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa());
 				
-				if (tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa() == null) {
+				if (StringUtils.isBlank(tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa())|| tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa().equalsIgnoreCase("null") ) {
 					HashMap<Integer, Integer> mapComposicaoDoPedagioNaTarifaOficialComPeaje = new HashMap();
 					String[] parDeChavePeajeMaisCasetaPeaje1 = tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje().replace(" ", "").split(",");
 					montaMapComposicao(mapComposicaoDoPedagioNaTarifaOficialComPeaje, parDeChavePeajeMaisCasetaPeaje1);