取消合并

performance/Performance.Services/DFExtractService.cs

@@ -1379,8 +1379,6 @@ private void SupplySpecialUnit(ISheet sheet, IPerSheetDataRead sheetRead, List<e
                 if (merges == null || !merges.Any()) return;
                 merges = merges.OrderBy(t => t.FirstRow).ToList();
 
-                var allmerge = sheet.MergedRegions;
-
                 int startRowIndex = sheetRead.Point.DataFirstRowNum ?? 2;
                 foreach (var merge in merges)
                 {
@@ -1436,10 +1434,12 @@ private void SupplySpecialUnit(ISheet sheet, IPerSheetDataRead sheetRead, List<e
                 }
 
                 //取消合并单元格
-                foreach (var merge in allmerge)
+                int mergedCount = sheet.NumMergedRegions;
+                for (int i = mergedCount - 1; i >= 0; i--)
                 {
-                    if (merge.LastRow > merge.FirstRow)
-                        sheet.RemoveMergedRegion(allmerge.IndexOf(merge));
+                    var temp = sheet.GetMergedRegion(i);
+                    if (temp.FirstRow > sheetRead.Point.HeaderFirstRowNum)
+                        sheet.RemoveMergedRegion(i);
                 }
 
                 foreach (var merge in merges.Where(t => t.FirstColumn == 0))

performance/Performance.Services/Performance.Services.csproj

@@ -12,8 +12,8 @@
 
   <ItemGroup>
     <PackageReference Include="CSRedisCore" Version="3.0.45" />
+    <PackageReference Include="DotNetCore.NPOI" Version="1.2.1" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
-    <PackageReference Include="NPOI" Version="2.5.1" />
   </ItemGroup>
 
   <ItemGroup>