From e26d278751eb89c42512ba5de7e156008eeea93c Mon Sep 17 00:00:00 2001
From: "vladan.milic" <vladan.milic@CPX-APUIX1QGW46.dir.svc.accenture.com>
Date: Fri, 20 Mar 2020 16:33:58 +0100
Subject: [PATCH] MWFAA-7 - Fix comma geolocated address for sending email

---
 .../service/AutomaticAssignmentService.java         | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/java/fr/paris/lutece/plugins/workflow/modules/formsautomaticassignment/service/AutomaticAssignmentService.java b/src/java/fr/paris/lutece/plugins/workflow/modules/formsautomaticassignment/service/AutomaticAssignmentService.java
index ed88df9..d75047e 100644
--- a/src/java/fr/paris/lutece/plugins/workflow/modules/formsautomaticassignment/service/AutomaticAssignmentService.java
+++ b/src/java/fr/paris/lutece/plugins/workflow/modules/formsautomaticassignment/service/AutomaticAssignmentService.java
@@ -563,8 +563,17 @@ private Map<String, Object> buildModel( TaskAutomaticAssignmentConfig config, Re
 
                         if ( model.containsKey( strKey ) )
                         {
-                            model.put( strKey, model.get( strKey ) + CONSTANT_COMMA + strQuestionResponseValue );
-
+                            if ( strQuestionResponseValue != null && !StringUtils.EMPTY.equals( strQuestionResponseValue ) )
+                            {
+                                if ( model.get( strKey ) != null && !StringUtils.EMPTY.equals( model.get( strKey ) ) )
+                                {
+                                    model.put( strKey, model.get( strKey ) + CONSTANT_COMMA + strQuestionResponseValue );
+                                } 
+                                else 
+                                {
+                                    model.put( strKey, strQuestionResponseValue );
+                                }
+                            }
                         }
                         else
                         {