From 2c51acc4a028f91d250314e088dc649e42a2333b Mon Sep 17 00:00:00 2001 From: tdx Date: Wed, 31 Dec 2025 07:03:16 +0000 Subject: [PATCH] SVN r1087 SVN-Revision: r1087 --- 插件库/Lskj.AutoCreatWord/CreateWordUtil.cs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/插件库/Lskj.AutoCreatWord/CreateWordUtil.cs b/插件库/Lskj.AutoCreatWord/CreateWordUtil.cs index a904d7b..33bfb62 100644 --- a/插件库/Lskj.AutoCreatWord/CreateWordUtil.cs +++ b/插件库/Lskj.AutoCreatWord/CreateWordUtil.cs @@ -30,12 +30,18 @@ namespace Lskj.AutoCreatWord Document saveDocument = new Document(); foreach (DataSet dataSet in dataSets) { - CreateWordUtil.InitTempDocuemnt(saveDocument, mainTempPath, menuTempPath, menuTempArray, dataSet); + Section firstSection = null; + bool hasMainTemp = false; + CreateWordUtil.InitTempDocuemnt(saveDocument, mainTempPath, menuTempPath, menuTempArray, dataSet, ref firstSection, ref hasMainTemp); CreateWordUtil.InitCreatBaseSql(saveDocument, dataSet, OAUrl); CreateWordUtil.InitCreatBaseSqlDetail(saveDocument, dataSet, OAUrl); CreateWordUtil.InitCreatTabSql(saveDocument, dataSet, OAUrl); CreateWordUtil.InitCreatTabSqlDetail(saveDocument, dataSet, OAUrl); CreateWordUtil.RemoveTableRow(saveDocument); + if (hasMainTemp && firstSection != null) + { + firstSection.PageSetup.DifferentFirstPageHeaderFooter = true; + } } bool flag = !Directory.Exists(Path.GetDirectoryName(savePath)); if (flag) @@ -62,16 +68,15 @@ namespace Lskj.AutoCreatWord } return result; } - private static Document InitTempDocuemnt(Document document, string mainTempPath, string menuTempPath, string menuTempArray, DataSet dataSet) + private static Document InitTempDocuemnt(Document document, string mainTempPath, string menuTempPath, string menuTempArray, DataSet dataSet, ref Section firstSection, ref bool hasMainTemp) { if (document == null) { document = new Document(); } - bool hasMainTemp = false; try { - Section firstSection = null; + firstSection = null; if (!string.IsNullOrEmpty(mainTempPath) && File.Exists(mainTempPath)) { Section mainSection = new Section(document); @@ -219,10 +224,6 @@ namespace Lskj.AutoCreatWord } } } - if (hasMainTemp) - { - firstSection.PageSetup.DifferentFirstPageHeaderFooter = true; - } } } catch (Exception ex)