From eb871b72ebe8874d8fdeef429592efed2e94224e Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Thu, 5 Dec 2024 15:58:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=A8=A1=E5=9E=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/platform/service/impl/ModelsServiceImpl.java    | 8 ++++++--
 .../platform/service/impl/NewDatasetServiceImpl.java      | 8 ++++++--
 2 files changed, 12 insertions(+), 4 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 e9f56899..e388cc04 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
@@ -605,8 +605,12 @@ public class ModelsServiceImpl implements ModelsService {
             gitService.createBranch(token, (String) userInfo.get("login"), repositoryName, branchName, "master");
             // 定义标签 标签1：ci4s-model 标签2：ModelTag 标签3：ModelType
             gitService.createTopic(token, gitlinIid, "ci4s-model");
-            gitService.createTopic(token, gitlinIid, "modeltag-" + modelsVo.getModelTag());
-            gitService.createTopic(token, gitlinIid, "modeltype-" + modelsVo.getModelType());
+            if (StringUtils.isNotEmpty(modelsVo.getModelTag())) {
+                gitService.createTopic(token, gitlinIid, "modeltag-" + modelsVo.getModelTag());
+            }
+            if (StringUtils.isNotEmpty(modelsVo.getModelType())) {
+                gitService.createTopic(token, gitlinIid, "modeltype-" + modelsVo.getModelType());
+            }
 
             dvcUtils.gitClone(rootPath, projectUrl, branchName, gitLinkUsername, gitLinkPassword);
 
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
index 177e2ac7..44cd03f1 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
@@ -112,8 +112,12 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         gitService.createBranch(token, (String) userInfo.get("login"), repositoryName, branchName, "master");
         // 定义标签 标签1：ci4s-dataset 标签2：DataTag 标签3：DataType
         gitService.createTopic(token, gitlinIid, "ci4s-dataset");
-        gitService.createTopic(token, gitlinIid, "datatag-" + datasetVo.getDataTag());
-        gitService.createTopic(token, gitlinIid, "datatype-" + datasetVo.getDataType());
+        if (StringUtils.isNotEmpty(datasetVo.getDataTag())) {
+            gitService.createTopic(token, gitlinIid, "datatag-" + datasetVo.getDataTag());
+        }
+        if (StringUtils.isNotEmpty(datasetVo.getDataType())) {
+            gitService.createTopic(token, gitlinIid, "datatype-" + datasetVo.getDataType());
+        }
 
         // 得到项目地址
         String projectUrl = gitendpoint + "/" + owner + "/" + repositoryName + ".git";