From b222c4215b999f8e6748fb608fa7e0a999e503ac Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 23 四月 2021 16:00:06 +0800 Subject: [PATCH] !23 同步dev Merge pull request !23 from 疯狂的狮子li/dev --- ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index c1a7ca8..073ece3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -201,6 +201,10 @@ { // 浠庣2琛屽紑濮嬪彇鏁版嵁,榛樿绗竴琛屾槸琛ㄥご. Row row = sheet.getRow(i); + if(row == null) + { + continue; + } T entity = null; for (Map.Entry<Integer, Field> entry : fieldsMap.entrySet()) { -- Gitblit v1.9.3