手动解决冲突

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

@@ -52,10 +52,10 @@ public class ModelsServiceImpl implements ModelsService {
     @Resource
     private ModelsVersionDao modelsVersionDao;
 
-    private MinioClient minioClient;
     @Resource
     private ModelsVersionService modelsVersionService;
 
+
     // 固定存储桶名
     private final String bucketName = "platform-data";
 
@@ -354,6 +354,7 @@ public class ModelsServiceImpl implements ModelsService {
         // 使用Stream API提取version字段，并去重
         return versions.stream()
                 .map(ModelsVersion::getVersion) // 提取每个ModelVersion对象的version属性
+                .filter(version -> version != null && !version.isEmpty()) //忽略null或空字符串的version
                 .distinct() // 去重
                 .collect(Collectors.toList()); // 收集到List中
     }