diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java index b74bd437..f2ce0ccd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java @@ -29,10 +29,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static com.jero.modules.activiti.common.ActivitiCommon.DISTRIBUTE; @@ -150,18 +147,20 @@ public class ProcessNodeService extends ServiceImpl() .eq(ProcessAll::getProcessInstanceId, processInstanceId) .ne(ProcessAll::getPrcStatus, ProcessStatusEnum.WITHDRAWN.getValue()), false); - ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne( - new LambdaQueryWrapper() - .eq(ProcessStandardInterpret::getProjectId, processAll.getProjectId())); - if (!String.valueOf(StandardInterpretCommon.IS_DISTRIBUTE_1) - .equals(processStandardInterpret.getDistribute())){ - processNodeList.removeIf(v -> - StandardInterpretCommon.MASTER_INTERPRET_SUMMARY.equals(v.getXmlNodeId())); + if (!Objects.isNull(processAll)){ + ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne( + new LambdaQueryWrapper() + .eq(ProcessStandardInterpret::getProjectId, processAll.getProjectId())); + if (!String.valueOf(StandardInterpretCommon.IS_DISTRIBUTE_1) + .equals(processStandardInterpret.getDistribute())){ + processNodeList.removeIf(v -> + StandardInterpretCommon.MASTER_INTERPRET_SUMMARY.equals(v.getXmlNodeId())); + } } } return processNodeList;