From d1c10f6a84a94d9909b947b62f8e6a919c981222 Mon Sep 17 00:00:00 2001
From: liqin <liqin@wisenergy.cn>
Date: Thu, 1 Apr 2021 11:05:27 +0800
Subject: [PATCH] bug fixed

---
 pom.xml                                       |  6 ++---
 .../party/common/util/ImportExcelUtil.java    | 22 +++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac7f0de..81e81ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,12 +120,12 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.17</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
+            <version>5.0.0</version>
         </dependency>
 
         <!-- Swagger2 Document -->
@@ -257,7 +257,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.6.0</version>
+            <version>5.6.2</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
diff --git a/src/main/java/cn/wisenergy/chnmuseum/party/common/util/ImportExcelUtil.java b/src/main/java/cn/wisenergy/chnmuseum/party/common/util/ImportExcelUtil.java
index 8dd6e48..248919a 100644
--- a/src/main/java/cn/wisenergy/chnmuseum/party/common/util/ImportExcelUtil.java
+++ b/src/main/java/cn/wisenergy/chnmuseum/party/common/util/ImportExcelUtil.java
@@ -1,11 +1,7 @@
 package cn.wisenergy.chnmuseum.party.common.util;
 
-
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import java.io.InputStream;
@@ -27,10 +23,10 @@ public class ImportExcelUtil {
         }
     }
 
-    public static List<Map<String,String>> readExcel(String fileName,InputStream is) throws Exception {
+    public static List<Map<String, String>> readExcel(String fileName, InputStream is) throws Exception {
 
         boolean ret = isXls(fileName);
-        Workbook workbook = null;
+        Workbook workbook;
         // 根据文件后缀创建不同的对象
         if (ret) {
             workbook = new HSSFWorkbook(is);
@@ -45,30 +41,28 @@ public class ImportExcelUtil {
         //列数
         int lastCellNum = titleRow.getLastCellNum();
 
-        List<Map<String,String>> list = new ArrayList<>();
+        List<Map<String, String>> list = new ArrayList<>();
 
         for (int i = 1; i <= lastRowNum; i++) {
             ArrayList<String> list1 = new ArrayList<>();
-            HashMap<String,String> map = new HashMap<>();
+            HashMap<String, String> map = new HashMap<>();
             //获取行数据
             Row row = sheet.getRow(i);
             for (int j = 0; j < lastCellNum; j++) {
                 //获取单元格
                 Cell cell = row.getCell(j);
-                if (cell!=null) {
-                    cell.setCellType(Cell.CELL_TYPE_STRING);
+                if (cell != null) {
+                    cell.setCellFormula(CellType.STRING.name());
                     //获取单元格数据
                     list1.add(cell.getStringCellValue());
                     //列名 ：数据
                     map.put(titleRow.getCell(j).getStringCellValue(), cell.getStringCellValue());
-                }else {
-                    continue;
                 }
             }
             list.add(map);
         }
         is.close();
         return list;
-
     }
+
 }
\ No newline at end of file
-- 
2.18.1