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 lqw = new LambdaQueryWrapper<>(); - lqw.eq(SysFileInfo::getFileCode, sysFileInfoRequest.getFileCode()).or().eq(SysFileInfo::getFileId, sysFileInfoRequest.getFileId()); - List fileInfos = this.list(lqw); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + wrapper.eq(SysFileInfo::getFileId, sysFileInfoRequest.getFileId()); + + if (ObjectUtil.isNotEmpty(sysFileInfoRequest.getFileCode())) { + wrapper.or().eq(SysFileInfo::getFileCode, sysFileInfoRequest.getFileCode()); + } + + List fileInfos = this.list(wrapper); // 批量删除 this.removeByIds(fileInfos.stream().map(SysFileInfo::getFileId).collect(Collectors.toList())); @@ -485,6 +491,13 @@ public class SysFileInfoServiceImpl extends ServiceImpl