From 95ac90573db2493e28741371f16a99654fbe896f Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 9 Feb 2021 12:29:48 +0000
Subject: [PATCH] fixes bug#21493 dev:wilian qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@105326 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java   | 4 ++--
 .../ventaboletos/entidad/CategoriaDescuento.java              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
index 7ece1907b..09e9ba44c 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
@@ -409,7 +409,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
 		 * Não aplica tarifa minina quando configurado no tipo de passagem ou quando nao tem a constante
 		 * Mantis #10704 & #20931
 		 */
-		if(isTarifaMinimaHabilitado && categoriaDescuento !=null && Boolean.TRUE.equals( categoriaDescuento.getIndnaoaplicatarifaminima()) ) {
+		if(isTarifaMinimaHabilitado && categoriaDescuento !=null && !categoriaDescuento.getIndnaoaplicatarifaminima()) {
 			sb.append(" 	(");
 			sb.append(" 		select IMPORTETARIFA");
 			sb.append(" 		from (");
@@ -555,7 +555,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
 		query.setParameter("corridaId", corrida.getCorridaId());
 		query.setParameter("feccorrida", corrida.getFeccorrida() + " 00:00:00");
 		
-		if(isTarifaMinimaHabilitado && categoriaDescuento !=null && Boolean.TRUE.equals( categoriaDescuento.getIndnaoaplicatarifaminima()) ) {
+		if(isTarifaMinimaHabilitado && categoriaDescuento !=null && !categoriaDescuento.getIndnaoaplicatarifaminima()) {
 			query.setParameter("plazaId", puntoVenta.getColonia().getCiudad().getPlaza().getPlazaId());
 			query.setParameter("claseservicioId", corrida.getClaseServicioId());
 			query.setParameter("categoriaId", Constantes.CATEGORIA_NORMAL);
diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java b/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
index fc610a491..21f98f9ff 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
@@ -708,7 +708,7 @@ public class CategoriaDescuento implements Serializable {
 	}
 
 	public Boolean getIndnaoaplicatarifaminima() {
-		return indnaoaplicatarifaminima;
+		return indnaoaplicatarifaminima != null ? indnaoaplicatarifaminima : Boolean.FALSE;
 	}
 
 	public void setIndnaoaplicatarifaminima(Boolean indnaoaplicatarifaminima) {