From 4351638be87d4636d313418be07bfc86ca5e2ee2 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 12 Dec 2019 10:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=8D=B8=E8=BD=BDsql?=
 =?UTF-8?q?=E6=9C=AA=E6=89=A7=E8=A1=8C=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/PluginsAdminService.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php
index 0a39d9aeb..7ff722d49 100755
--- a/application/service/PluginsAdminService.php
+++ b/application/service/PluginsAdminService.php
@@ -376,11 +376,7 @@ class PluginsAdminService
             // 是否需要删除应用数据,sql运行
             $is_delete_static = (isset($params['value']) && $params['value'] == 1);
 
-            // 删除数据库附件
-            ResourcesService::AttachmentPathTypeDelete('plugins_'.$params['id']);
-
-            // 删除应用文件
-            self::PluginsResourcesDelete($params['id'], $is_delete_static);
+            // 执行卸载sql
             if($is_delete_static === true)
             {
                 $uninstall_sql = APP_PATH.'plugins'.DS.$params['id'].DS.'uninstall.sql';
@@ -389,6 +385,12 @@ class PluginsAdminService
                     SqlconsoleService::Implement(['sql'=>file_get_contents($uninstall_sql)]);
                 }
             }
+
+            // 删除数据库附件
+            ResourcesService::AttachmentPathTypeDelete('plugins_'.$params['id']);
+
+            // 删除应用文件
+            self::PluginsResourcesDelete($params['id'], $is_delete_static);
             return DataReturn('删除成功');
         }
         return $ret;
-- 
GitLab