SVN r347

SVN-Revision: r347
2025-03-19 05:31:19 +00:00
parent 14d833210c
commit f83f23b52b
1 changed files with 6 additions and 33 deletions
@@ -559,7 +559,7 @@ namespace Lskj.PubSpecialImport
                            startRow = mergrRange.LastRow + 1;
                            if (mergrRange != null)
                            {
-                                if (mergrRange.FirstColumn < mergrRange.LastColumn)
+                                if (mergrRange.FirstColumn < mergrRange.LastColumn && !Model.CustomerServiceApp)
                                {
                                    isBandTitle = true;
                                    bandRow = sheet.GetRow(mergrRange.LastRow + 1);
@@ -575,6 +575,10 @@ namespace Lskj.PubSpecialImport
                                        startRow = mergrRange.LastRow + 2;
                                    }
                                }
+                                else
+                                {
+                                    startRow = mergrRange.LastRow + 1;
+                                }
                            }
                        }
                        string fieldName = "";
@@ -1458,35 +1462,4 @@ namespace Lskj.PubSpecialImport
                }
                else
                {
-                    result = ReplaceHelper.ReplaceRowParamCond(dataRow, cond);
-                }
-            }
-            catch (Exception)
-            {
-            }
-            return result;
-        }
-        /// <summary>
-        /// 获取合并区域
-        /// </summary>
-        /// <param name="sheet"></param>
-        /// <param name="rowIndex"></param>
-        /// <param name="columnIndex"></param>
-        /// <returns></returns>
-        private CellRangeAddress FindMergedRegion(ISheet sheet, int rowIndex, int columnIndex)
-        {
-            int mergedRegionsCount = sheet.NumMergedRegions;
-
-            for (int i = 0; i < mergedRegionsCount; i++)
-            {
-                CellRangeAddress mergedRegion = sheet.GetMergedRegion(i);
-                if (mergedRegion.IsInRange(rowIndex, columnIndex))
-                {
-                    return mergedRegion; // 返回合并区域
-                }
-            }
-            return null; // 未找到合并区域
-        }
-        #endregion
-    }
-}
+                    result = Repl