From 4b560b144a48f778dd162f8bf0d97530194df879 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 1 Jan 2022 23:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E3=80=90file=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6=E5=88=A0=E9=99=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/service/impl/SysFileInfoServiceImpl.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 96a555c70..9222749d5 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
@@ -188,8 +188,8 @@ public class SysFileInfoServiceImpl extends ServiceImpl<SysFileInfoMapper, SysFi
         SysFileInfoResponse sysFileInfoResponse = this.getFileInfoResult(sysFileInfoRequest.getFileId());
 
         // 如果文件加密等级不符合，文件不允许被访问
-        if(YesOrNotEnum.Y.getCode().equals(sysFileInfoResponse.getSecretFlag())){
-            if(YesOrNotEnum.N.getCode().equals(sysFileInfoRequest.getSecretFlag())){
+        if (YesOrNotEnum.Y.getCode().equals(sysFileInfoResponse.getSecretFlag())) {
+            if (YesOrNotEnum.N.getCode().equals(sysFileInfoRequest.getSecretFlag())) {
                 throw new FileException(FileExceptionEnum.FILE_DENIED_ACCESS);
             }
         }
@@ -203,7 +203,7 @@ public class SysFileInfoServiceImpl extends ServiceImpl<SysFileInfoMapper, SysFi
 
         // 查询该Code的所有历史版本
         LambdaQueryWrapper<SysFileInfo> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(SysFileInfo::getFileCode, sysFileInfoRequest.getFileCode());
+        lqw.eq(SysFileInfo::getFileCode, sysFileInfoRequest.getFileCode()).or().eq(SysFileInfo::getFileId, sysFileInfoRequest.getFileId());
         List<SysFileInfo> fileInfos = this.list(lqw);
 
         // 批量删除
@@ -297,8 +297,8 @@ public class SysFileInfoServiceImpl extends ServiceImpl<SysFileInfoMapper, SysFi
         SysFileInfoResponse sysFileInfoResponse = this.getFileInfoResult(sysFileInfoRequest.getFileId());
 
         // 如果文件加密等级不符合，文件不允许被访问
-        if(YesOrNotEnum.Y.getCode().equals(sysFileInfoResponse.getSecretFlag())){
-            if(YesOrNotEnum.N.getCode().equals(sysFileInfoRequest.getSecretFlag())){
+        if (YesOrNotEnum.Y.getCode().equals(sysFileInfoResponse.getSecretFlag())) {
+            if (YesOrNotEnum.N.getCode().equals(sysFileInfoRequest.getSecretFlag())) {
                 throw new FileException(FileExceptionEnum.FILE_DENIED_ACCESS);
             }
         }