diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index e924831e..7a66a7ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -445,9 +445,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { processInfoVO.setBasicTaskInfoDTO(basicTaskInfoDTO); // 流程信息 - if (StringUtils.isNotBlank(projectId)) { -// ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper().eq(ProcessAll::getProjectId, projectId), false); + if (StringUtils.isNotBlank(processInstanceId)) { + ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); if (!Objects.isNull(processAll)) { basicProcessInfoDTO.setProcessInstanceId(processAll.getProcessInstanceId()); basicProcessInfoDTO.setProcessType(processAll.getPrcType()); @@ -469,6 +468,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { basicTaskInfoDTO.setHandleText(processDraft.getHandleText()); basicTaskInfoDTO.setHandleFile(processDraft.getHandleFile()); processInfoVO.setDraftId(draftId); + processInfoVO.setBusinessId(processDraft.getProjectId()); basicProcessInfoDTO.setProcessType(processDraft.getPrcType()); basicProcessInfoDTO.setProcessName(processDraft.getPrcName()); basicProcessInfoDTO.setProcessDescription(processDraft.getProcessDescription());