gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_no_common_group' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop_no_common_group

Browse Source
This commit is contained in:
zhangwei
2019-01-29 14:23:43 +06:00
parent fa20de4df1 85f09a60be
commit 0ebee67507
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/util/excel/XLSXCovertCSVReader.java
View File

@@ -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);