From 6c0dc9f8675e091339d0a0d8162227f770dd956c Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Thu, 10 Oct 2024 12:19:51 -0300
Subject: [PATCH 1/2] =?UTF-8?q?fixes=20bug#AL-5080=20Quando=20novo=20regis?=
 =?UTF-8?q?tro=20n=C3=A3o=20tem=20operador=20edi=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../seguridad/EditarOperadorEmbarcadaController.java          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8fd454bb0..7df60f07a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.152.15</version> 
+	<version>1.152.16</version> 
 	<packaging>war</packaging> 
     
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarOperadorEmbarcadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarOperadorEmbarcadaController.java
index ab1af2d65..b633ec59c 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarOperadorEmbarcadaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarOperadorEmbarcadaController.java
@@ -505,6 +505,7 @@ public class EditarOperadorEmbarcadaController extends MyGenericForwardComposer
 				return;
 			}
 			
+			
 			for(Usuario us : usuariosSelecionados) {
 				OperadorEmbarcada operador = operadorService.buscarOperadorEmbarcadaPorUsuario(us.getUsuarioId());
 				
@@ -556,7 +557,8 @@ public class EditarOperadorEmbarcadaController extends MyGenericForwardComposer
 				operador = operadorService.suscribirActualizar(operador, linhas, listaServicos);
 				
 				Usuario usuario = operador.getUsuario();
-				String OperadorId = operadorEdicao.getOperadorEmbarcadaId().toString();
+				
+				String OperadorId = (operadorEdicao.getOperadorEmbarcadaId() ==  null ? "" :operadorEdicao.getOperadorEmbarcadaId().toString());
 				
 				String senha = InputMessageBox.showQuestion(Labels.getLabel("limparCacheAPI.message.senha"), 
 						Labels.getLabel("limparCacheAPI.title"), Messagebox.OK);

From 657c19dc13423e878053d48a67cfa0f61c61fbdb Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Thu, 10 Oct 2024 12:40:29 -0300
Subject: [PATCH 2/2] fixes bug#AL-5080

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7df60f07a..fc2fb3cef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.152.16</version> 
+	<version>1.153.1</version> 
 	<packaging>war</packaging> 
     
 	<properties>
-		<modelWeb.version>1.114.3</modelWeb.version>
+		<modelWeb.version>1.115.0</modelWeb.version>
 		<flyway.version>1.98.3</flyway.version>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>