From 2c96ffe5dc51919d983f94e6bff3d98ffb1c2763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 28 Dec 2021 16:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzqdfb/step2.vue | 11 +++++------
 .../processCenter/pages/creatProcess/bzqdfb/step4.vue | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index 0f5cf113e..39463de6e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -382,14 +382,13 @@ export default {
       }
     },
     downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+        this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        if (attId != null && attId !== '') {
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
-          this.$message.error("请选择要下载的文件");
+          this.$message.error('请选择要下载的文件')
         }
       }
     },
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 260c2adec..0bb277f1a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -452,14 +452,13 @@ export default {
       }
     },
     downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+        this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        if (attId != null && attId !== '') {
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
-          this.$message.error("请选择要下载的文件");
+          this.$message.error('请选择要下载的文件')
         }
       }
     },