|
@@ -261,7 +261,7 @@ public class ExcelUtil<T>
|
|
* @param is 输入流
|
|
* @param is 输入流
|
|
* @return 转换后集合
|
|
* @return 转换后集合
|
|
*/
|
|
*/
|
|
- public List<T> importExcel(InputStream is) throws Exception
|
|
|
|
|
|
+ public List<T> importExcel(InputStream is)
|
|
{
|
|
{
|
|
List<T> list = null;
|
|
List<T> list = null;
|
|
try
|
|
try
|
|
@@ -428,7 +428,7 @@ public class ExcelUtil<T>
|
|
{
|
|
{
|
|
propertyName = field.getName() + "." + attr.targetAttr();
|
|
propertyName = field.getName() + "." + attr.targetAttr();
|
|
}
|
|
}
|
|
- else if (StringUtils.isNotEmpty(attr.readConverterExp()))
|
|
|
|
|
|
+ if (StringUtils.isNotEmpty(attr.readConverterExp()))
|
|
{
|
|
{
|
|
val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
|
|
val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
|
|
}
|
|
}
|