|
@@ -279,6 +279,10 @@ public class ExcelUtil<T>
|
|
|
val = DateUtil.getJavaDate((Double) val);
|
|
|
}
|
|
|
}
|
|
|
+ else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
|
|
|
+ {
|
|
|
+ val = Convert.toBool(val, false);
|
|
|
+ }
|
|
|
if (StringUtils.isNotNull(fieldType))
|
|
|
{
|
|
|
Excel attr = field.getAnnotation(Excel.class);
|
|
@@ -295,9 +299,6 @@ public class ExcelUtil<T>
|
|
|
{
|
|
|
val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
|
|
|
}
|
|
|
- if (fieldType == boolean.class && (val == null||"".equals(val))) {
|
|
|
- val = false;
|
|
|
- }
|
|
|
ReflectUtils.invokeSetter(entity, propertyName, val);
|
|
|
}
|
|
|
}
|