From 85f09a60be8d049708206d7d76dae908b8302864 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Tue, 29 Jan 2019 12:31:24 +0600
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E7=9A=84=E5=80=BC?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8Map=E5=A2=9E=E5=8A=A0key=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=80=A7=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/excel/XLSXCovertCSVReader.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/util/excel/XLSXCovertCSVReader.java b/src/main/java/com/nis/util/excel/XLSXCovertCSVReader.java
index 79f66204b..f16e5770a 100644
--- a/src/main/java/com/nis/util/excel/XLSXCovertCSVReader.java
+++ b/src/main/java/com/nis/util/excel/XLSXCovertCSVReader.java
@@ -293,7 +293,9 @@ public abstract class XLSXCovertCSVReader {
                     int len = countNullCell(refnum, preRefnum);  
                     for(int i=0;i<len;i++){  
                         rowlist.add(curCol, ""); 
-                        rowMap.put(thisColumn, "");
+                        if(!rowMap.containsKey(thisColumn)){
+                        	rowMap.put(thisColumn, "");
+                        }
                         curCol++;  
                     }  
                 }  
@@ -332,7 +334,9 @@ public abstract class XLSXCovertCSVReader {
                         int len = countNullCell(maxRefnum, refnum);  
                         for(int i=0;i<=len;i++){  
                             rowlist.add(curCol, ""); 
-                            //rowMap.put(thisColumn, "");
+                            if(!rowMap.containsKey(thisColumn)){
+                            	rowMap.put(thisColumn, "");
+                            }
                             curCol++;  
                         } 
                        int totalLen= countTotalCell(maxRefnum);