Fixed bug for GEPAFINBE-30

This commit is contained in:
nisha
2024-10-07 20:33:21 +05:30
parent 7743f26354
commit a82aad9073

View File

@@ -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.CustomValidationException;
import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
import net.gepafin.tendermanagement.web.rest.api.errors.Status; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@@ -247,19 +248,20 @@ public class FormDao {
// Only map if the list is not empty and contains Strings // Only map if the list is not empty and contains Strings
if (!list.isEmpty() && list.get(0) instanceof String) { if (!list.isEmpty() && list.get(0) instanceof String) {
for (Object value : list) { 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<String, Object> formFieldMap, Object value) { private void setFormFieldMap(String fieldId, Map<String, Object> formFieldMap, Object value) {
if (value instanceof String) { if (value instanceof String) {
if(fieldValue !=null && ((String) fieldValue).isEmpty()) if(value !=null && Boolean.FALSE.equals(StringUtils.isEmpty((String)value))) {
formFieldMap.put(fieldId, value); formFieldMap.put(fieldId, value);
} }
} }
}
private Boolean getApplicationFormExist(ApplicationFormEntity applicationFormEntity) { private Boolean getApplicationFormExist(ApplicationFormEntity applicationFormEntity) {
if(applicationFormEntity !=null) { if(applicationFormEntity !=null) {