|
|
@@ -1367,10 +1367,10 @@ public class ModelsServiceImpl implements ModelsService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (modelTopicName != null && modelTopic.equals(modelTopicName)) { |
|
|
if (modelTopicName != null && modelTopic.equals(modelTopicName)) { |
|
|
if (StrUtil.containsAnyIgnoreCase(modelTagName, modelTag)) { |
|
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(modelTagName) && !modelTagName.toLowerCase().equals(modelTag)) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
if (StrUtil.containsAnyIgnoreCase(modelTypeName, modelType)) { |
|
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(modelTypeName) && !modelTypeName.toLowerCase().equals(modelType)) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
newModelVo.setModelTag(modelTagName); |
|
|
newModelVo.setModelTag(modelTagName); |
|
|
|