From 1cac4221b7979ec5b69c0ec6949c6766dcc5f908 Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 18 Feb 2022 18:41:35 +0000
Subject: [PATCH] fixes bug#24125 qua: dev:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@110947 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioLogAuditoria.java           |   4 ++--
 .../templates/RelatorioLogAuditoria.jasper    | Bin 34833 -> 34830 bytes
 .../templates/RelatorioLogAuditoria.jrxml     |   8 ++++----
 .../BusquedaLogAuditoriaController.java       |   4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLogAuditoria.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLogAuditoria.java
index 0fb1329ee..63aa567d7 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLogAuditoria.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLogAuditoria.java
@@ -25,8 +25,8 @@ public class RelatorioLogAuditoria extends RelatorioDemandas {
 			
 			bean.setIdAuditado(log.getIdAuditado());
 			bean.setCampoAlterado(log.getCampoAlterado());
-			bean.setEmpresa(log.getEmpresa().getNombempresa());
-			bean.setUsuario(log.getUsuario().getNombusuario());
+			bean.setEmpresa(log.getEmpresa() != null ? log.getEmpresa().getNombempresa() : "");
+			bean.setUsuario(log.getUsuario() != null ? log.getUsuario().getNombusuario() : "");
 			bean.setClasseAlterada(log.getClasseAlterada());
 			bean.setClassePrincipal(log.getClassePrincipal());
 			bean.setTela(log.getTela());
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jasper
index 40a68f4ebbe1a47ae8043b64ade787bf132f6ddb..d7885364cec58368881b4e92386a9e721d494c28 100644
GIT binary patch
delta 115
zcmbO@fvIl-(*`|XE*4`8OUsJlA_kqwhV1H_<9s6oI2SQ6Ff}j$!Q_hxmXm+P%1oAt
zQQmAFr^>?Uzd14K46~rAk%5J|v6+#DdAyOOfw7V0X1larMG*|)5(Xonu`-i?w~GM)
DZUG=O

delta 106
zcmeC1z%+3J(*`|XPG(DU^NQjk2A#=<?CP82eIo=|(-;_-_DtRr8#y`9Ky9;moEi&b
v_vW~yGt7b}mZqjACYBavrtuaghUR9*o2}D&6-6+FOBjrR#>q_n(Jlr6gLfWQ

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jrxml
index 765749e72..ec3ff6eb3 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLogAuditoria.jrxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="relatorioFormaPagamentoAgencia" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="832cc8a2-6330-4063-9b36-f96514ae8283">
 	<property name="ireport.zoom" value="6.1159090448414934"/>
-	<property name="ireport.x" value="977"/>
+	<property name="ireport.x" value="3899"/>
 	<property name="ireport.y" value="102"/>
 	<parameter name="DATA_INICIAL" class="java.util.Date"/>
 	<parameter name="DATA_FINAL" class="java.util.Date"/>
@@ -54,8 +54,8 @@
 				<reportElement uuid="7e62b5c0-9626-4774-b650-1dc0906be19d" x="1" y="40" width="801" height="1"/>
 			</line>
 			<textField pattern="dd/MM/yyyy HH:mm">
-				<reportElement uuid="eeee2daa-07e2-427c-9b9a-9fdb48f7a4ea" mode="Opaque" x="700" y="0" width="102" height="20" backcolor="#CDCDCD"/>
-				<textElement textAlignment="Right"/>
+				<reportElement uuid="eeee2daa-07e2-427c-9b9a-9fdb48f7a4ea" mode="Opaque" x="640" y="0" width="162" height="20" backcolor="#CDCDCD"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
@@ -69,7 +69,7 @@
 				<textFieldExpression><![CDATA[$P{USUARIO_ID}+"-"+$P{NOME_USUARIO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d219b329-181b-4ef6-b4f6-b624acb75988" mode="Opaque" x="561" y="0" width="139" height="20" backcolor="#CDCDCD"/>
+				<reportElement uuid="d219b329-181b-4ef6-b4f6-b624acb75988" mode="Opaque" x="561" y="0" width="79" height="20" backcolor="#CDCDCD"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
 			</textField>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java
index 6e3db91ea..3a5ce1940 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java
@@ -181,8 +181,8 @@ public class BusquedaLogAuditoriaController extends MyGenericForwardComposer {
 		StringBuilder filtro = new StringBuilder();
 
 
-		parametros.put("DATA_FINAL", (java.util.Date) dtInicio.getValue());
-		parametros.put("DATA_INICIAL", (java.util.Date) dtFim.getValue());
+		parametros.put("DATA_INICIAL", (java.util.Date) dtInicio.getValue());
+		parametros.put("DATA_FINAL", (java.util.Date) dtFim.getValue());
 		parametros.put("NOME_RELATORIO", Labels.getLabel("busquedaLogAuditoriaController.window.title"));
 		parametros.put("USUARIO_ID", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
 		parametros.put("NOME_USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario());