From d7e33b4ea751b4c21806c7681f801ec5e4eb7dda Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 26 Jan 2024 09:25:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2081189=20=E4=BC=81=E6=A0=87=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B--=E7=94=9F=E6=88=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8D=95=E6=96=87=E4=BB=B6=EF=BC=8C=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=AC=AC=E4=BA=8C=E4=BD=8D=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=8F=96=E8=87=AA=E4=B8=BB=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esChange/listener/ProcessESChangeEndListener.java | 9 +++++++-- .../service/impl/BusProcessModelHisServiceImpl.java | 3 +++ 2 files changed, 10 insertions(+), 2 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 104321d4..4381d605 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 @@ -123,8 +123,10 @@ public class ProcessESChangeEndListener implements ExecutionListener { // 转换成Map 然后走commonEdit接口 Map parameterMap = new HashMap<>(); this.buildMap(parameterMap, change); - // 替换响应文件的url - busProcessModelHisService.replaceFile(change.getOnEditFile(), change.getReplaceFileId()); + // 替换相应文件的url + if (change.getReplaceFileId() != null) { + busProcessModelHisService.replaceFile(change.getOnEditFile(), change.getReplaceFileId()); + } // 保存修改的文件 commonService.commonEdit(parameterMap); // 生成修改单号 @@ -288,6 +290,9 @@ public class ProcessESChangeEndListener implements ExecutionListener { } } } + if (deptCode.equals("U")) { + throw new JeroBootException("生成修改单失败，找不到主起草单位的单位代号，请前往字典管理中添加后再试"); + } // 找到年份 Date effectiveDate = new Date(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy"); diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java index 05a5b949..8bc2a9b6 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java @@ -376,6 +376,9 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl onlineFileLogList = onlineFileLogDao.selectList(wrapper); OnlineFileLog onlineFileLog = onlineFileLogList.get(0); + if (onlineFileLog == null) { + throw new RuntimeException("找不到最新的在线编辑文件记录"); + } OSSFile ossFile = ossFileService.getById(onlineFileLog.getAttFileId()); // 获取文件 String path = filePath + ossFile.getUrl();