diff --git a/src/main/java/neatlogic/framework/util/FormUtil.java b/src/main/java/neatlogic/framework/util/FormUtil.java index d54a499ea6b9aae55c5a4a62aa8b5544b923a171..5969541866d369e4c3cb46805fe1e0a408bcc132 100644 --- a/src/main/java/neatlogic/framework/util/FormUtil.java +++ b/src/main/java/neatlogic/framework/util/FormUtil.java @@ -354,9 +354,14 @@ public class FormUtil { FormAttributeVo downwardFormAttributeVo = downwardFormAttributeMap.get(key); if (downwardFormAttributeVo != null) { IFormAttributeDataConversionHandler handler = FormAttributeDataConversionHandlerFactory.getHandler(downwardFormAttributeVo.getHandler()); - Object enhanceReadabilityValue = handler.getEnhanceReadabilityValue(value, downwardFormAttributeVo); - newRowObj.put(downwardFormAttributeVo.getKey(), enhanceReadabilityValue); - newRowObj.put(downwardFormAttributeVo.getLabel(), enhanceReadabilityValue); + if (handler != null) { + Object enhanceReadabilityValue = handler.getEnhanceReadabilityValue(value, downwardFormAttributeVo); + newRowObj.put(downwardFormAttributeVo.getKey(), enhanceReadabilityValue); + newRowObj.put(downwardFormAttributeVo.getLabel(), enhanceReadabilityValue); + } else { + newRowObj.put(downwardFormAttributeVo.getKey(), value); + newRowObj.put(downwardFormAttributeVo.getLabel(), value); + } } } dataList.add(newRowObj);