From d43548e21a2df52effaef706068e08a16935e56a Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 18 Nov 2022 10:16:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/yxt/common/base/utils/WordUtils.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/WordUtils.java b/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/WordUtils.java
index 600adfc..c0f0a3c 100644
--- a/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/WordUtils.java
+++ b/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/WordUtils.java
@@ -110,7 +110,9 @@ public class WordUtils {
             // 打开文档
             document = Dispatch.call(documents, "Open", wordFile, false, true).toDispatch();
             // 如果文件存在的话，不会覆盖，会直接报错，所以我们需要判断文件是否存在
-            addWatermark(app,documents,document,wordFile,"D:\\anrui\\1.doc",mark);
+            if (StringUtils.isNotBlank(mark)){
+                addWatermark(app,documents,document,wordFile,wordFile,mark);
+            }
             //setWaterMark(app,mark);
             File targetFile = new File(pdfPath);
             if (!targetFile.exists()) {
@@ -158,7 +160,7 @@ public class WordUtils {
                     //取得视窗对象
                     Dispatch view = Dispatch.get(activePan, "View").toDispatch();
                     //打开页眉
-                    Dispatch.put(view, "SeekView", new Variant(9));
+                    Dispatch.put(view, "SeekView", new Variant(1));
                     //获取页眉和页脚
                     Dispatch headfooter = Dispatch.get(docSelect, "HeaderFooter")
                             .toDispatch();