From 6a5ecc71b86c4a5a0ce657da6a1465f8acf86881 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 1 Apr 2024 17:58:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E4=B8=8A=E4=BC=A0=E8=A7=A3=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/esAnnualInit/controller/ESAnnualInitController.java | 2 ++
 .../esAnnualReport/controller/ESAnnualReportController.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java
index ea6bfdd9..77f59ae2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java
@@ -5,6 +5,7 @@ import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.common.constant.enums.YesOrNoEnum;
+import com.jero.common.util.IntekeyUtils;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
@@ -183,6 +184,7 @@ public class ESAnnualInitController {
     @AutoLog(value = "企标年度制修订标准化发起流程-导入")
     @Translation
     public Result<?> importExcel(@ApiParam(value = "要上传的文件", required = true) @RequestParam("file") MultipartFile file) {
+        file = IntekeyUtils.autoDecryptFile(file);
         Map<String, Object> resultMap = annualInitService.importData(file);
         Object flag = resultMap.get("flag");
         if (flag == YesOrNoEnum.YES.getValue()) {
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
index 0d7bb8e7..e3e7dced 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
@@ -6,6 +6,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.common.constant.enums.YesOrNoEnum;
+import com.jero.common.util.IntekeyUtils;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
@@ -95,6 +96,7 @@ public class ESAnnualReportController {
     @AutoLog(value = "企标年度制修订主动上报流程-导入")
     @Translation
     public Result<?> importExcel(@ApiParam(value = "要上传的文件", required = true) @RequestParam("file") MultipartFile file) {
+        file = IntekeyUtils.autoDecryptFile(file);
         Map<String, Object> resultMap = annualReportService.importData(file);
         Object flag = resultMap.get("flag");
         if (flag == YesOrNoEnum.YES.getValue()) {