diff --git a/ExcelTool/ExcelHelper.cs b/ExcelTool/ExcelHelper.cs index dc8ec80..b372cd8 100644 --- a/ExcelTool/ExcelHelper.cs +++ b/ExcelTool/ExcelHelper.cs @@ -13,10 +13,10 @@ namespace ExcelTool { try { - List headers = new(); + List headers = []; using FileStream fs = File.OpenRead(fileName); - IWorkbook wk = new XSSFWorkbook(fs); + XSSFWorkbook wk = new(fs); sheetCount = wk.NumberOfSheets; if (sheetNum >= sheetCount) @@ -27,6 +27,10 @@ namespace ExcelTool ISheet sheet = wk.GetSheetAt(sheetNum); sheetName = sheet.SheetName; + if (sheetName.StartsWith('#')) + { + return null; + } IRow nameRow = sheet.GetRow(0); // 字段名 IRow typeRow = sheet.GetRow(1); // 类型 @@ -73,10 +77,11 @@ namespace ExcelTool using FileStream fs = File.OpenRead(fileName); IWorkbook wk = new XSSFWorkbook(fs); - if (sheetNum >= sheetCount) + if (sheetNum >= sheetCount || sheetName.StartsWith('#')) { return null; } + ISheet sheet = wk.GetSheetAt(sheetNum); for (int i = 5; i <= sheet.LastRowNum; i++) diff --git a/ExcelTool/Parser/TableExcelData.cs b/ExcelTool/Parser/TableExcelData.cs index e60c4c1..17d1ec1 100644 --- a/ExcelTool/Parser/TableExcelData.cs +++ b/ExcelTool/Parser/TableExcelData.cs @@ -5,8 +5,8 @@ namespace ExcelTool.Parser { public class TableExcelData { - private List headers = new List(); - private List rows = new List(); + List headers = new(); + List rows = new(); public int CollonCount = 0; public int RowCounts = 0;