From d3335284e9b6883093267783c901127770ae1b42 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 18 二月 2025 11:06:56 +0800
Subject: [PATCH] 删除逻辑完善

---
 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml                    |    6 +++---
 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java |    2 +-
 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java            |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java
index 3907fae..2557aa5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java
@@ -19,5 +19,5 @@
 
     List<Long> getWillDeleted(@Param("maxTime") LocalDateTime maxTime);
 
-    void deleteIds(@Param("ids") List<Long> ids);
+    void deleteId(@Param("id") Long id);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index 0e99f74..af94fc1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -323,7 +323,7 @@
         for (SysOss sysOss : list) {
             OssClient storage = OssFactory.instance(sysOss.getService());
             storage.delete(sysOss.getUrl());
-            baseMapper.deleteById(sysOss.getOssId());
+            baseMapper.deleteId(sysOss.getOssId());
         }
     }
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml
index ef4fbf0..e3cab30 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml
@@ -3,11 +3,11 @@
 <mapper namespace="org.dromara.system.mapper.SysOssMapper">
 
     <select id="getWillDeleted" resultType="long">
-        SELECT oss_id from sys_oss WHERE create_time &lt;= #{maxTime}
+        SELECT oss_id from sys_oss WHERE create_time &lt;= #{maxTime} AND deleted = 0
     </select>
 
-    <delete id="deleteIds" parameterType="integer">
-        DELETE FROM sys_oss WHERE oss_id IN <foreach collection="ids" open="(" separator="," close=")" item="id">#{id}</foreach>
+    <delete id="deleteId" parameterType="integer">
+        DELETE FROM sys_oss WHERE oss_id = #{id}
     </delete>
 
 </mapper>

--
Gitblit v1.8.0