From 160dd0388c5e98ee0ac291f3b8a2cbecd2e08d1c Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Wed, 23 Jun 2021 19:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=A0=B9=E6=8D=AE=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E5=88=A0=E9=99=A4=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=A3=81=E7=9B=98=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/ResourcesService.php | 25 ++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/application/service/ResourcesService.php b/application/service/ResourcesService.php
index 303d9a08d..4a01d20e0 100755
--- a/application/service/ResourcesService.php
+++ b/application/service/ResourcesService.php
@@ -423,12 +423,29 @@ class ResourcesService
      */
     public static function AttachmentPathTypeDelete($path_type)
     {
-        // 请求参数
-        if(DB::name('Attachment')->where(['path_type'=>$path_type])->delete() !== false)
+        // 获取附件数据
+        $where = ['path_type'=>$path_type];
+        $data = DB::name('Attachment')->where($where)->column('url');
+        if(!empty($data))
         {
-            return DataReturn('删除成功', 0);
+            // 删除数据库数据
+            if(!DB::name('Attachment')->where($where)->delete())
+            {
+                return DataReturn('删除失败', -1);
+            }
+
+            // 删除磁盘文件
+            $path = substr(ROOT_PATH, 0, -1);
+            foreach($data as $v)
+            {
+                $file = $path.$v;
+                if(file_exists($file) && is_writable($file))
+                {
+                    \base\FileUtil::UnlinkFile($file);
+                }
+            }
         }
-        return DataReturn('删除失败', -100);
+        return DataReturn('删除成功', 0);
     }
 
     /**
-- 
GitLab