From 46c477c1057a24d6979c010244a9c026de4f7f59 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Wed, 26 Jun 2019 00:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=84=E5=BB=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/ResourcesService.php | 34 +++++++++++++++---------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/application/service/ResourcesService.php b/application/service/ResourcesService.php
index 306e166a0..c03d1ce17 100755
--- a/application/service/ResourcesService.php
+++ b/application/service/ResourcesService.php
@@ -306,25 +306,35 @@ class ResourcesService
                 {
                     // 删除附件
                     \base\FileUtil::UnlinkFile($path);
-                    
-                    // 附件删除成功后处理钩子
-                    $hook_name = 'plugins_service_attachment_delete_success';
-                    Hook::listen($hook_name, [
-                        'hook_name'         => $hook_name,
-                        'is_backend'        => true,
-                        'data'              => $data,
-                    ]);
 
-                    return DataReturn('删除成功', 0);
+                    $ret = DataReturn('删除成功', 0);
                 } else {
-                    return DataReturn('删除失败', -1);
+                    $ret = DataReturn('删除失败', -1);
                 }
             } else {
-                return DataReturn('没有删除权限', -1);
+                $ret = DataReturn('没有删除权限', -1);
             }
         } else {
-            return DataReturn('文件不存在', -1);
+            if(DB::name('Attachment')->where(['id'=>$data['id']])->delete())
+            {
+                $ret = DataReturn('删除成功', 0);
+            } else {
+                $ret = DataReturn('删除失败', -1);
+            }
         }
+
+        // 处理
+        if($ret['code'] == 0)
+        {
+            // 附件删除成功后处理钩子
+            $hook_name = 'plugins_service_attachment_delete_success';
+            Hook::listen($hook_name, [
+                'hook_name'         => $hook_name,
+                'is_backend'        => true,
+                'data'              => $data,
+            ]);
+        }
+        return $ret;
     }
 }
 ?>
\ No newline at end of file