Merge remote-tracking branch 'origin/dev' into dev-opt

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

@@ -713,7 +713,7 @@ public class ModelsServiceImpl implements ModelsService {
         Map<String, Object> userInfo = getUserInfo(ci4sUsername, gitLinkPassword);
         gitLinkPassword = decrypt(gitLinkPassword);
 
-        if (modelsVo.getVersion() == null) {
+        if (StringUtils.isEmpty(modelsVo.getVersion())) {
             List<Map<String, Object>> versionList = getVersionList(modelsVo.getIdentifier(), modelsVo.getOwner());
             //自动填充版本
             String nextVersion = incrementVersion(versionList);

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java

@@ -195,7 +195,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
     }
 
     public String newCreateVersion(NewDatasetVo datasetVo) throws Exception {
-        if (datasetVo.getVersion() == null) {
+        if (StringUtils.isEmpty(datasetVo.getVersion())) {
             List<Map<String, Object>> versionList = getVersionList(datasetVo.getIdentifier(), datasetVo.getOwner());
             //自动填充版本
             String nextVersion = incrementVersion(versionList);

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java

@@ -385,7 +385,7 @@ public class WorkflowServiceImpl implements WorkflowService {
         try {
             Map<String, Object> dataset = (Map<String, Object>) inParameters.get("--dataset");
             Object value = dataset.get("value");
-            if (value instanceof String) {
+            if (value instanceof String || value == null) {
                 return;
             }
             LinkedHashMap<String, Object> valueMap = (LinkedHashMap<String, Object>) dataset.get("value");
@@ -409,7 +409,7 @@ public class WorkflowServiceImpl implements WorkflowService {
         try {
             Map<String, Object> model = (Map<String, Object>) inParameters.get("--model_name");
             Object value = model.get("value");
-            if (value instanceof String) {
+            if (value instanceof String || value == null) {
                 return;
             }
             LinkedHashMap<String, Object> valueMap = (LinkedHashMap<String, Object>) model.get("value");