From 5fca7b2ff9633dbe56cb21f10a389995a47331a1 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Fri, 22 Jul 2022 23:26:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.3=E3=80=91=E3=80=90file=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0removeFile=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/file/api/FileInfoApi.java    |  8 ++++++++
 .../service/impl/SysFileInfoServiceImpl.java  | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java
index 474d85468..2507fb4a1 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java
@@ -84,4 +84,12 @@ public interface FileInfoApi {
      */
     AntdvFileInfo buildAntdvFileInfo(Long fileId);
 
+    /**
+     * 真实删除文件
+     *
+     * @author fengshuonan
+     * @date 2022/7/22 23:19
+     */
+    void removeFile(Long fileId);
+
 }
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
index e21ad6de4..4405c516c 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
@@ -213,9 +213,15 @@ public class SysFileInfoServiceImpl extends ServiceImpl<SysFileInfoMapper, SysFi
     public void deleteReally(SysFileInfoRequest sysFileInfoRequest) {
 
         // 查询该Code的所有历史版本
-        LambdaQueryWrapper<SysFileInfo> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(SysFileInfo::getFileCode, sysFileInfoRequest.getFileCode()).or().eq(SysFileInfo::getFileId, sysFileInfoRequest.getFileId());
-        List<SysFileInfo> fileInfos = this.list(lqw);
+        LambdaQueryWrapper<SysFileInfo> wrapper = new LambdaQueryWrapper<>();
+
+        wrapper.eq(SysFileInfo::getFileId, sysFileInfoRequest.getFileId());
+
+        if (ObjectUtil.isNotEmpty(sysFileInfoRequest.getFileCode())) {
+            wrapper.or().eq(SysFileInfo::getFileCode, sysFileInfoRequest.getFileCode());
+        }
+        
+        List<SysFileInfo> fileInfos = this.list(wrapper);
 
         // 批量删除
         this.removeByIds(fileInfos.stream().map(SysFileInfo::getFileId).collect(Collectors.toList()));
@@ -485,6 +491,13 @@ public class SysFileInfoServiceImpl extends ServiceImpl<SysFileInfoMapper, SysFi
         return antdvFileInfo;
     }
 
+    @Override
+    public void removeFile(Long fileId) {
+        SysFileInfoRequest sysFileInfoRequest = new SysFileInfoRequest();
+        sysFileInfoRequest.setFileId(fileId);
+        this.deleteReally(sysFileInfoRequest);
+    }
+
     /**
      * 渲染被预览的文件到servlet的response流中
      *