From 739037627eb98c0b176b96a372802bbb9ad7f66d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 30 Jan 2024 11:34:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B2=A1=E6=9C=89=E5=9C=A8=E7=BA=BF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=96=87=E4=BB=B6=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esChange/listener/ProcessESChangeEndListener.java | 2 +- .../esRevision/listener/ProcessESRevisionEndListener.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java index 4381d605..42b043b2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java @@ -124,7 +124,7 @@ public class ProcessESChangeEndListener implements ExecutionListener { Map parameterMap = new HashMap<>(); this.buildMap(parameterMap, change); // 替换相应文件的url - if (change.getReplaceFileId() != null) { + if (StrUtil.isNotBlank(change.getReplaceFileId()) && StrUtil.isNotBlank(change.getOnEditFile())) { busProcessModelHisService.replaceFile(change.getOnEditFile(), change.getReplaceFileId()); } // 保存修改的文件 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java index 4f97bd6c..92b85af3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java @@ -101,8 +101,11 @@ public class ProcessESRevisionEndListener implements ExecutionListener { String standardId = IdWorker.getIdStr(); variables.put(FieldCommon.ID, standardId); // minio上传在线编辑文件 - String fileId = busProcessModelHisService.saveProcessFileToOss(data.getOnEditFile()); - variables.put(FieldCommon.FILE_PUBLISH_OF_ORIGINAL, fileId); + String onEditFile = data.getOnEditFile(); + if (StringUtils.isNotBlank(onEditFile)) { + String fileId = busProcessModelHisService.saveProcessFileToOss(onEditFile); + variables.put(FieldCommon.FILE_PUBLISH_OF_ORIGINAL, fileId); + } // 发布企标 lawsCommonService.commonAdd(variables); String espId = data.getEspId();