lxy/excel-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复使用设计上的缺陷

Browse Source
This commit is contained in:
lxyer 2019-03-27 17:20:02 +08:00
parent 74aa9781e1
commit 923aae75c5
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/lxyer/excel/poi/ExcelKit.java
View File

@ -235,9 +235,9 @@ public class ExcelKit {
List<Map> maps = readExcel(sheet, fields, lastRowNum); List<Map> maps = readExcel(sheet, fields, lastRowNum);
//move head //move head
if (lastRowNum < 0 && maps.size() > 0) { /*if (lastRowNum < 0 && maps.size() > 0) {
maps.remove(0); maps.remove(0);
} }*/
data.put(sheet.getSheetName(), maps); data.put(sheet.getSheetName(), maps);
} }
return data; return data;
@ -358,13 +358,27 @@ public class ExcelKit {
private static Workbook getWorkbook(File file) throws IOException { private static Workbook getWorkbook(File file) throws IOException {
Workbook wk; Workbook wk;
FileInputStream fis = new FileInputStream(file);
try { try {
wk = new HSSFWorkbook(new FileInputStream(file));//if excel version 2007+ will throws OfficeXmlFileException wk = new HSSFWorkbook(fis);//if excel version 2007+ will throws OfficeXmlFileException
} catch (OfficeXmlFileException e) { } catch (OfficeXmlFileException e) {
wk = new XSSFWorkbook(new FileInputStream(file)); wk = new XSSFWorkbook(fis);
} finally {
if (fis != null) {
try {
fis.close();
} catch (Exception e) {
//e.printStackTrace();
}
}
} }
return wk; return wk;
} }
//dev
public void setWorkbook(File file) {
}
} }