From 4dbf62ba10f1e3bf81eac9226516ad93e1fdbe28 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 20 Jan 2021 13:06:13 +0000
Subject: [PATCH] fixes bug#21207 dev:valdir qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@105104 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/service/impl/ComissaoServiceImpl.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ComissaoServiceImpl.java
index a997f97c4..36d65225f 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ComissaoServiceImpl.java
@@ -66,14 +66,17 @@ public class ComissaoServiceImpl implements ComissaoService {
 	@Override
 	public List<HistoricoComissao> buscaHistoricoComissao(Integer puntoVentaId, Integer empresaId, Date periodoInicio, Date periodoFim) {
 		String competenciaInicial = DateUtil.getStringDate(periodoInicio, "MM/yyyy");
-		String competenciaFinal = DateUtil.getStringDate(periodoInicio, "MM/yyyy");
+		String competenciaFinal = DateUtil.getStringDate(periodoFim, "MM/yyyy");
 		
 		Map<String, Object> parametros = new HashMap<String, Object>();
 		parametros.put("competenciaInicial", competenciaInicial);
 		parametros.put("competenciaFinal", competenciaFinal);
-		parametros.put("puntoventaId", puntoVentaId);
 		parametros.put("empresaId", empresaId);
 		
+		if(puntoVentaId != null && puntoVentaId > -1) {
+			parametros.put("puntoventaId", puntoVentaId);
+		}
+		
 		return comissaoDAO.buscaHistoricoComissao(parametros);
 	}