From 3d6912f8a48441e1d36e1a092a385d2a2f8251f5 Mon Sep 17 00:00:00 2001
From: fabio <fabio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 23 Nov 2020 18:20:56 +0000
Subject: [PATCH] bug#20993 dev: Valvevir qua:

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
index b1b128ab3..967aa0bf4 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
@@ -396,7 +396,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 && Boolean.TRUE.equals( categoriaDescuento.getIndnaoaplicatarifaminima()) ) {
+		if(isTarifaMinimaHabilitado && categoriaDescuento !=null && Boolean.TRUE.equals( categoriaDescuento.getIndnaoaplicatarifaminima()) ) {
 			sb.append(" 	(");
 			sb.append(" 		select IMPORTETARIFA");
 			sb.append(" 		from (");
@@ -542,7 +542,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
 		query.setParameter("corridaId", corrida.getCorridaId());
 		query.setParameter("feccorrida", corrida.getFeccorrida() + " 00:00:00");
 		
-		if(isTarifaMinimaHabilitado && Boolean.TRUE.equals( categoriaDescuento.getIndnaoaplicatarifaminima()) ) {
+		if(isTarifaMinimaHabilitado && categoriaDescuento !=null && Boolean.TRUE.equals( categoriaDescuento.getIndnaoaplicatarifaminima()) ) {
 			query.setParameter("plazaId", puntoVenta.getColonia().getCiudad().getPlaza().getPlazaId());
 			query.setParameter("claseservicioId", corrida.getClaseServicioId());
 			query.setParameter("categoriaId", Constantes.CATEGORIA_NORMAL);