From 450b41507e3e213cde2479204d9aa29a2fccbeb8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 18 二月 2025 10:58:23 +0800
Subject: [PATCH] 删除逻辑完善

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

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 336b02f..c7d8f81 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,7 +3,7 @@
 <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>
 
 

--
Gitblit v1.8.0