From b529dac3113ff4e104bf11e303fa73a0ce4020c4 Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Mon, 23 Sep 2024 16:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=AE=9E=E9=AA=8C=E6=97=B6?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=89=88=E6=9C=AC=E5=B1=9E=E4=BA=8E=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/platform/service/impl/ModelsServiceImpl.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
index 07d1d97a..63cd7461 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
@@ -720,11 +720,13 @@ public class ModelsServiceImpl implements ModelsService {
                 }
             }
 
+            ModelMetaVo modelMetaVo = new ModelMetaVo();
             ModelDependency1 buildingModel = modelDependency1Dao.getBuildingModel(modelsVo.getId(), modelsVo.getIdentifier(), modelsVo.getVersion());
-            ModelMetaVo modelMetaVo1 = JSON.parseObject(buildingModel.getMeta(), ModelMetaVo.class);
+            if (buildingModel != null) {
+                modelMetaVo = JSON.parseObject(buildingModel.getMeta(), ModelMetaVo.class);
+            }
 
             //拼接生产的元数据后写入yaml文件
-            ModelMetaVo modelMetaVo = new ModelMetaVo();
             BeanUtils.copyProperties(modelsVo, modelMetaVo);
             modelMetaVo.setCreateBy(String.valueOf(StringUtils.isNotEmpty((String) userInfo.get("nickname")) ? userInfo.get("nickname") : userInfo.get("login")));
             modelMetaVo.setCreateTime(DateUtils.getTime());