From e7fc70af5fa86c1127b72e2b83cf1be5e993d18f Mon Sep 17 00:00:00 2001
From: fanshuai <1141904845@qq.com>
Date: Mon, 8 Apr 2024 14:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/platform/service/impl/DatasetServiceImpl.java    | 6 ++----
 .../com/ruoyi/platform/service/impl/ModelsServiceImpl.java | 7 ++-----
 .../src/main/java/com/ruoyi/platform/utils/MinioUtil.java  | 1 +
 .../mapper/managementPlatform/ModelsVersionDaoMapper.xml   | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
index b3f43347..3033407f 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
@@ -59,11 +59,9 @@ public class DatasetServiceImpl implements DatasetService {
     // 固定存储桶名
     private final String bucketName = "platform-data";
 
-    private final MinioUtil minioUtil;
+    @Resource
+    private  MinioUtil minioUtil;
 
-    public DatasetServiceImpl(MinioUtil minioUtil) {
-        this.minioUtil = minioUtil;
-    }
 
 
     /**
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 6b711468..b84c43d4 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
@@ -58,12 +58,9 @@ public class ModelsServiceImpl implements ModelsService {
 
     // 固定存储桶名
     private final String bucketName = "platform-data";
+    @Resource
+    private  MinioUtil minioUtil;
 
-    private final MinioUtil minioUtil;
-
-    public ModelsServiceImpl(MinioUtil minioUtil) {
-        this.minioUtil = minioUtil;
-    }
 
     /**
      * 通过ID查询单条数据
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java
index 1f4c1217..363f1508 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java
@@ -31,6 +31,7 @@ public class MinioUtil {
     @Value("${minio.secretKey}")
     private String minioSecretKey;
     private MinioClient minioClient;
+
     @PostConstruct
     public void init() {
         this.minioClient = MinioClient.builder()
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml
index 9ed76e2e..6461a525 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml
@@ -39,10 +39,10 @@
         from models_version
         <where>
             state = 1
-            <if test="modelsId != null">
+            <if test="modelsVersion.modelsId != null">
                 and models_id = #{modelsVersion.modelsId}
             </if>
-            <if test="version != null and version != ''">
+            <if test="modelsVersion.version != null and modelsVersion.version != ''">
                 and version = #{modelsVersion.version}
             </if>
         </where>