From 0a8d7293fdd63adaa6c87e11d42343ab8cfe22a9 Mon Sep 17 00:00:00 2001
From: "lucas.taia" <lucas.taia@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 13 Nov 2018 19:25:32 +0000
Subject: [PATCH] bug#12283

dev:lucas

qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@87027 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../controladores/catalogos/EditarEmpresaController.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
index 3c1a0fb1d..19c16f5b4 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
@@ -252,8 +252,10 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 		lsCidades = new ArrayList<Ciudad>();
 		lsBanco = instFinanceiraService.obtenerTodos();
 		
-		empresaEmail = empresaEmailService.buscarPorEmpresa(empresa);
-		empresaEmailConfig = empresaEmailConfigService.buscarPorEmpresa(empresa);
+		if (empresa != null && empresa.getEmpresaId() != null) {
+			empresaEmail = empresaEmailService.buscarPorEmpresa(empresa);
+			empresaEmailConfig = empresaEmailConfigService.buscarPorEmpresa(empresa);
+		}
 		
 		super.doAfterCompose(comp);