From a82aad907331df511fc9cc8d5f2d37f4c3f4b007 Mon Sep 17 00:00:00 2001 From: nisha Date: Mon, 7 Oct 2024 20:33:21 +0530 Subject: [PATCH] Fixed bug for GEPAFINBE-30 --- .../java/net/gepafin/tendermanagement/dao/FormDao.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java index bee7885c..84c9d9b1 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java @@ -15,6 +15,7 @@ import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; @@ -247,17 +248,18 @@ public class FormDao { // Only map if the list is not empty and contains Strings if (!list.isEmpty() && list.get(0) instanceof String) { for (Object value : list) { - setFormFieldMap(fieldId, fieldValue, formFieldMap, value); + setFormFieldMap(fieldId, formFieldMap, value); } } } - else setFormFieldMap(fieldId, fieldValue, formFieldMap, fieldValue); + else setFormFieldMap(fieldId, formFieldMap, fieldValue); } - private void setFormFieldMap(String fieldId, Object fieldValue, Map formFieldMap, Object value) { + private void setFormFieldMap(String fieldId, Map formFieldMap, Object value) { if (value instanceof String) { - if(fieldValue !=null && ((String) fieldValue).isEmpty()) + if(value !=null && Boolean.FALSE.equals(StringUtils.isEmpty((String)value))) { formFieldMap.put(fieldId, value); + } } }