[fix] when first row(s) is empty, query return data will not contain …

…the empty row(s) (#578) Co-authored-by: hansen <[email protected]>
mini-software · Mar 31, 2024 · 9e3f1bd · 9e3f1bd
1 parent b27b169
commit 9e3f1bd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/MiniExcel/OpenXml/ExcelOpenXmlSheetReader.cs b/src/MiniExcel/OpenXml/ExcelOpenXmlSheetReader.cs
@@ -288,11 +288,12 @@ public IEnumerable<IDictionary<string, object>> Query(bool useHeaderRow, string
                                 }
 
                                 // fill empty rows
-                                if (!(nextRowIndex < startRowIndex))
+                                var expectedRowIndex = isFirstRow ? startRowIndex : nextRowIndex;
+                                if (!(expectedRowIndex < startRowIndex))
                                 {
-                                    if (nextRowIndex < rowIndex)
+                                    if (expectedRowIndex < rowIndex)
                                     {
-                                        for (int i = nextRowIndex; i < rowIndex; i++)
+                                        for (int i = expectedRowIndex; i < rowIndex; i++)
                                         {
                                             yield return GetCell(useHeaderRow, maxColumnIndex, headRows, startColumnIndex);
                                         }