fix: 82013 企标更改流程--流程阻塞

laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java

@@ -31,6 +31,8 @@ import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
+import com.jero.modules.onlyoffice.service.IBusProcessModelHisService;
+import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.sys.utils.UserUtils;
 import com.jero.modules.system.service.ISysUserDepartService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +85,9 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
     @Resource
     private ProcessAllService processAllService;
 
+    @Resource
+    private IBusProcessModelHisService busProcessModelHisService;
+
     @Override
     public void startProcess(ESChangeDataVO changeData) {
         // 执行流程发起前的操作
@@ -111,6 +116,13 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
         actFlowCommonService.setProcessVariables(processInstanceId, actVariables);
         // 设置流程实例Id
         esChange.setProcessInstanceId(processInstanceId);
+        // 设置替换文件id
+        OSSFile lastDocFileByStandardNo = busProcessModelHisService.findLastDocFileByStandardNo(esChange.getStandardNumber());
+        if (lastDocFileByStandardNo != null) {
+            esChange.setReplaceFileId(lastDocFileByStandardNo.getId());
+        } else {
+            esChange.setReplaceFileId(null);
+        }
         // 保存到业务流程表
         saveOrUpdate(esChange);
         if (opinionList != null && !opinionList.isEmpty()) {

laws-modules/src/main/java/com/jero/modules/onlyoffice/service/IBusProcessModelHisService.java

@@ -3,6 +3,7 @@ package com.jero.modules.onlyoffice.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.onlyoffice.entity.BusProcessModelHis;
 import com.jero.modules.onlyoffice.entity.OnlineFileLog;
+import com.jero.modules.oss.entity.OSSFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -42,4 +43,6 @@ public interface IBusProcessModelHisService extends IService<BusProcessModelHis>
     String saveProcessFileToOss(String hisId);
 
     BusProcessModelHis findEditFileByStandardNo(String standardNo);
+
+    OSSFile findLastDocFileByStandardNo(String standardNo);
 }

laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java

@@ -387,7 +387,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
         MultipartFile multipartFile = BusProcessModelHisServiceImpl.convert(file);
         String savePath = CommonUtils.upload(multipartFile, "", uploadType);
         OSSFile replaceFile = ossFileService.getById(replaceId);
-        if (oConvertUtils.isNotEmpty(savePath)) {
+        if (oConvertUtils.isNotEmpty(savePath) && replaceFile != null) {
             // 文件名
             String fileName = his.getFileName();
             fileName = CommonUtils.getFileName(fileName);
@@ -437,7 +437,8 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
         return this.saveEditFileWithOss(lastDocFileByStandardNo.getId());
     }
 
-    private OSSFile findLastDocFileByStandardNo(String standardNo) {
+    @Override
+    public OSSFile findLastDocFileByStandardNo(String standardNo) {
         LambdaQueryWrapper<LawsEnterpriseStandard> esWrapper = new LambdaQueryWrapper<>();
         esWrapper.eq(LawsEnterpriseStandard::getStandardNumber, standardNo);
         LawsEnterpriseStandard es = eSService.getOne(esWrapper);