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 7a3c3143..75039847 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 @@ -1367,10 +1367,10 @@ public class ModelsServiceImpl implements ModelsService { } if (modelTopicName != null && modelTopic.equals(modelTopicName)) { - if (StrUtil.containsAnyIgnoreCase(modelTagName, modelTag)) { + if (StringUtils.isNotEmpty(modelTagName) && !modelTagName.toLowerCase().equals(modelTag)) { continue; } - if (StrUtil.containsAnyIgnoreCase(modelTypeName, modelType)) { + if (StringUtils.isNotEmpty(modelTypeName) && !modelTypeName.toLowerCase().equals(modelType)) { continue; } newModelVo.setModelTag(modelTagName); 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 755a0c79..16090586 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 @@ -720,10 +720,10 @@ public class NewDatasetServiceImpl implements NewDatasetService { } if (datasetTopic.equals(datasetTopicName)) { - if (StrUtil.containsAnyIgnoreCase(datasetTagName, datasetTag)) { + if (StringUtils.isNotEmpty(datasetTagName) && !datasetTagName.toLowerCase().equals(datasetTag)) { continue; } - if (StrUtil.containsAnyIgnoreCase(datasetTypeName, datasetType)) { + if (StringUtils.isNotEmpty(datasetTypeName) && !datasetTypeName.toLowerCase().equals(datasetType)) { continue; } newDatasetVo.setDataTag(datasetTagName);