From 59b4248532a2c9898668888942e4a90ae853ebde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8A=E6=96=87?= <workforbetter@qq.com>
Date: Fri, 26 Mar 2021 15:09:43 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=A2=E5=A4=B1=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=88=A0=E9=99=A4=E6=9D=A1=E7=9B=AE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ISysFileServiceImpl.java     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysFileServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysFileServiceImpl.java
index 9cc5c048..01b0f55c 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysFileServiceImpl.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysFileServiceImpl.java
@@ -137,11 +137,21 @@ public class ISysFileServiceImpl implements ISysFileService {
     @Override
     public boolean remove(String id) {
         SysFile file = fileMapper.selectById(id);
-        new java.io.File(file.getFilePath()).delete();
-        int removeInfo = fileMapper.deleteById(id);
-        if(removeInfo>0){
-            return true;
+        boolean fileDeleteResult;
+        //如果文件不存在
+        if (file != null && file.getFilePath() != null) {
+            File deleteFile;
+            if((deleteFile=new File(file.getFilePath())).exists()){
+                fileDeleteResult=deleteFile.delete();
+            }else {
+                fileDeleteResult=false;
+            }
+        } else {
+            fileDeleteResult = false;
+        }
+        if (fileDeleteResult) {
+            log.warn("fileId:{} ,need delete file:{} not exists ", id, file.getFilePath());
         }
-        return false;
+        return fileMapper.deleteById(id) > 0;
     }
 }
-- 
Gitee