From 1f4d3ee17c005026e23e7408fc70a9ec832a2ea8 Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 16 May 2016 20:58:39 +0000
Subject: [PATCH] bug #7448

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@56034 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../EditarSecretariaController.java                         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java
index d7dd50466..5d782fc45 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java
@@ -218,7 +218,11 @@ public class EditarSecretariaController extends MyGenericForwardComposer {
                 (Secretaria) Executions.getCurrent().getArg().get("secretaria");
         secretariaList =
                 (MyListbox) Executions.getCurrent().getArg().get("secretariaList");
-        lsSecretariaEmpresa = secretariaEmpresaService.buscarPorSecretaria(secretaria);
+        if (secretaria.getSecretariaId() != null){
+        	lsSecretariaEmpresa = secretariaEmpresaService.buscarPorSecretaria(secretaria);
+        } else {
+        	lsSecretariaEmpresa = new ArrayList<SecretariaEmpresa>();
+        }
         lsEmpresas = empresaService.obtenerTodosIncluindoEmpresaTodas();
         
         super.doAfterCompose(comp);