diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/handler/inter/IExcelDataModel.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/handler/inter/IExcelDataModel.java index 2731ad5..7c53675 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/handler/inter/IExcelDataModel.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/handler/inter/IExcelDataModel.java @@ -10,12 +10,12 @@ public interface IExcelDataModel { * 获取行号 * @return */ - public int getRowNum(); + public Integer getRowNum(); /** * 设置行号 * @param rowNum */ - public void setRowNum(int rowNum); + public void setRowNum(Integer rowNum); } diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiValidationUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiValidationUtil.java index 7ac1ecf..47a529e 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiValidationUtil.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiValidationUtil.java @@ -65,13 +65,17 @@ public class PoiValidationUtil { if (superClass != null) { fields.addAll(Arrays.asList(superClass.getDeclaredFields())); } + String name = null; for (Field field: fields) { if (field.getName().equals(fieldName) && field.isAnnotationPresent(Excel.class)) { - builder.append(field.getAnnotation(Excel.class).name()); + name = field.getAnnotation(Excel.class).name(); break; } } - builder.append(constraintViolation.getMessage()).append(","); + if (name == null) { + name = fieldName; + } + builder.append(name).append(constraintViolation.getMessage()).append(","); } return builder.substring(0, builder.length() - 1); }