From bdb79fd8697eedadbf5065a1ffc65d9660e39a6e Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Wed, 12 Jun 2024 09:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=BC=94=E5=8C=96=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ModelDependencyServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java index da002c9a..f3c48ebb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java @@ -167,8 +167,6 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { modelsVersionquery.setModelsId(currentModelId); modelsVersionquery.setVersion(modelDependency.getVersion()); ModelsVersion modelsVersion = modelsVersionService.queryByModelsVersion(modelsVersionquery); - ExperimentIns experimentIns = experimentInsService.queryById(expInsId); - Experiment experiment = experimentService.queryById(experimentIns.getExperimentId()); ModelVersionDependcyVo modelVersionDependcyVo = new ModelVersionDependcyVo(); modelVersionDependcyVo.setName(models.getName()); modelVersionDependcyVo.setAvailableRange(models.getAvailableRange()); @@ -182,9 +180,16 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { modelVersionDependcyVo.setUrl(modelsVersion.getUrl()); modelVersionDependcyVo.setCreateBy(modelsVersion.getCreateBy()); modelVersionDependcyVo.setCreateTime(modelsVersion.getCreateTime()); - modelDependcyTreeVo.setWorkflowId(experiment.getWorkflowId()); modelDependcyTreeVo.setModelVersionDependcyVo(modelVersionDependcyVo); - + ExperimentIns experimentIns = experimentInsService.queryById(expInsId); + if (experimentIns == null){ + return modelDependcyTreeVo; + } + Experiment experiment = experimentService.queryById(experimentIns.getExperimentId()); + if (experiment == null){ + return modelDependcyTreeVo; + } + modelDependcyTreeVo.setWorkflowId(experiment.getWorkflowId()); return modelDependcyTreeVo; }