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<String, Object> 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<BusProcessModelHi
         wrapper.orderByDesc(OnlineFileLog::getCreateTime);
         List<OnlineFileLog> 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();