fix: 81189 企标更改流程--生成修改单文件，通知单号第二位单位应该取自主起草单位

2024-01-26 10:11:09 +08:00
parent 7e00b3a1e6
commit d7e33b4ea7
2 changed files with 10 additions and 2 deletions
@@ -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");
@@ -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();