Merge branch 'dev-1.1.14' of github.com:WeDataSphere/DataSphereStudio…

… into dev-1.1.14
WeDataSphere · Sep 11, 2023 · 9c3af91 · 9c3af91
2 parents e73a246 + 70710a8
commit 9c3af91
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...om/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java b/...om/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java
@@ -192,7 +192,10 @@ public DSSOrchestratorVersion importOrchestrator(RequestImportOrchestrator reque
         String orchestrationContent = (String) responseRef.getRefJobContent().get(OrchestratorRefConstant.ORCHESTRATION_CONTENT_KEY);
         List<String[]> paramConfTemplateIds = (List<String[]>) responseRef.getRefJobContent().get(OrchestratorRefConstant.ORCHESTRATION_FLOWID_PARAMCONF_TEMPLATEID_TUPLES_KEY);
         if(null != existFlag){
-            addOrchestratorVersionHook.beforeAdd(oldVersion,Collections.emptyMap());
+            if(oldVersion!=null) {
+                //如果生产中心的所有orc版本的valid_flag都是0（之前的所有发布都在convert期间失败了），那么oldVersion是为空的。
+                addOrchestratorVersionHook.beforeAdd(oldVersion, Collections.emptyMap());
+            }
             //如果Orchestrator已经导入过，目前只更新版本信息，并更新基础信息name,其它信息不修改。
             orchestratorMapper.updateOrchestrator(importDssOrchestratorInfo);
         }else{