From b1f4952cde3f64afd8ea4fe1533493a581e45eaa Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 1 Jun 2019 14:42:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5Excel=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E4=B8=8E=E6=B3=A8=E8=A7=A3=E5=90=8D=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/pom.xml                               |  2 +-
 .../com/ruoyi/common/utils/poi/ExcelUtil.java     | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 4fd84125..9d76b8e4 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -8,7 +8,7 @@
         <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
     <artifactId>ruoyi-admin</artifactId>
 	
 	<description>
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 0536ace2..f853c9a6 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
@@ -136,17 +136,20 @@ public class ExcelUtil<T>
 
         if (rows > 0)
         {
-
             // 定义一个map用于存放excel列的序号和field.
             Map<String, Integer> cellMap = new HashMap<String, Integer>();
-            //获取表头
+            // 获取表头
             Row heard = sheet.getRow(0);
-            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
+            {
                 Cell cell = heard.getCell(i);
-                if (StringUtils.isNotNull(cell != null)) {
-                    String value=this.getCellValue(heard, i).toString();
+                if (StringUtils.isNotNull(cell != null))
+                {
+                    String value = this.getCellValue(heard, i).toString();
                     cellMap.put(value, i);
-                } else {
+                }
+                else
+                {
                     cellMap.put(null, i);
                 }
             }