Merge pull request '6125' (#61) from dev into master

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;
     }