From b0ce075b62551101e01f21c85543cc0e71dac443 Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@ip-10-31-170-148.ec2.internal>
Date: Tue, 11 Jul 2023 17:16:06 -0300
Subject: [PATCH] fixes bug#AL-2908

---
 pom.xml                                                     | 2 +-
 .../ventaboletos/entidad/ConfRestricaoCanalVenta.java       | 6 +++---
 .../ventaboletos/service/impl/CategoriaCtrlServiceImpl.java | 2 +-
 .../service/impl/ConfRestricaoCanalVentaServiceImpl.java    | 2 +-
 .../service/impl/ConfRestricaoVendaWebServiceImpl.java      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 907483809..cf3cb0566 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.6.11</version>
+	<version>1.6.12</version>
 	<distributionManagement>
         <repository>
             <id>rj-releases</id>
diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoCanalVenta.java b/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoCanalVenta.java
index 7a516a889..4cf8b4807 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoCanalVenta.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoCanalVenta.java
@@ -95,10 +95,10 @@ public class ConfRestricaoCanalVenta implements Serializable, Cloneable, Auditav
 	@OneToOne
 	@JoinColumn(name = "RUTA_ID")
 	private Ruta ruta;
-	@AuditarLista(auditarEntidades = true, nome = "lsConfRestricaoExcecao")
+	@AuditarLista(auditarEntidades = true, nome = "Exceções de Data Serviço")
 	@OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
 	private List<ConfRestricaoExcecao> lsConfRestricaoExcecao;
-	@AuditarLista(auditarEntidades = true, nome = "lsConfRestricaoPtovta")
+	@AuditarLista(auditarEntidades = true, nome = "Exceções de Pontos de Vendas")
 	@OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
 	private List<ConfRestricaoPtovta> lsConfRestricaoPtovta;
 	@Column(name = "INDEXIBECONSULTAVENDAWEB")
@@ -116,7 +116,7 @@ public class ConfRestricaoCanalVenta implements Serializable, Cloneable, Auditav
 	private Date fecfinvigencia;
 	@Column(name = "INDRESTRICAODINAMICA")
 	private Boolean indRestricaoDinamica;
-	@AuditarLista(auditarEntidades = true, nome = "lsConfRestricaoTramo")
+	@AuditarLista(auditarEntidades = true, nome = "Exceções de Trechos")
 	@OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
 	@Where(clause="activo=1")
 	private List<ConfRestricaoTramo> lsConfRestricaoTramo;
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCtrlServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCtrlServiceImpl.java
index 79dca8aae..d33f15714 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCtrlServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCtrlServiceImpl.java
@@ -133,7 +133,7 @@ public class CategoriaCtrlServiceImpl implements CategoriaCtrlService {
 		entidad.setFecmodif(Calendar.getInstance().getTime());
 		entidad.setActivo(Boolean.TRUE);
 		entidad = categoriaCtrlDAO.actualizacion(entidad);	
-		logAuditoriaService.auditar(originalClone, entidad, null);
+		logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null);
 		
 		return entidad;
 		
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java
index 7ecc9f2bb..e89ffff17 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java
@@ -54,7 +54,7 @@ public class ConfRestricaoCanalVentaServiceImpl implements ConfRestricaoCanalVen
 			return entidad;
 		}else{
 			confRestricaoCanalVentaDAO.actualizacion(entidad);
-			logAuditoriaService.auditar(originalClone, entidad, null);
+			logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null);
 			return entidad;
 		}
 	}
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoVendaWebServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoVendaWebServiceImpl.java
index 357e69dbc..8668544d6 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoVendaWebServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoVendaWebServiceImpl.java
@@ -74,7 +74,7 @@ public class ConfRestricaoVendaWebServiceImpl implements ConfRestricaoVendaWebSe
 		entidad.setFecmodif(Calendar.getInstance().getTime());
 		entidad.setActivo(Boolean.TRUE);
 		confRestricaoVendaWebDAO.actualizacion(entidad);
-		logAuditoriaService.auditar(originalClone, entidad, null);
+		logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null);
 		
 		return entidad;
 	}