From d41cb3f4cd9e1c275e54d130afdcbd932fc3f9eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E6=B8=85=E7=88=BD?= <eison.icu@gmail.com>
Date: Thu, 10 Apr 2025 17:57:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=AE=A1=E5=90=8E=E5=8F=B0=20-=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B6=85=E7=AE=A1=E7=94=A8=E6=88=B7=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superadmin/controller/Administrator.php   | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/Server/application/superadmin/controller/Administrator.php b/Server/application/superadmin/controller/Administrator.php
index 14189dac..0a58400b 100644
--- a/Server/application/superadmin/controller/Administrator.php
+++ b/Server/application/superadmin/controller/Administrator.php
@@ -307,20 +307,32 @@ class Administrator extends Controller
             return json(['code' => 404, 'msg' => '管理员不存在']);
         }
         
-        // 执行软删除
-        $admin->deleteTime = time();
-        $result = $admin->save();
-        
-        if ($result) {
+        // 开启事务
+        AdminModel::startTrans();
+        try {
+            // 执行软删除
+            $admin->deleteTime = time();
+            $adminResult = $admin->save();
+            
+            // 删除对应的权限记录
+            $permissionModel = new AdministratorPermissions();
+            $permResult = $permissionModel->where('adminId', $id)->update(['deleteTime' => time()]);
+            
+            // 提交事务
+            AdminModel::commit();
+            
             return json([
                 'code' => 200,
                 'msg' => '删除成功',
                 'data' => null
             ]);
-        } else {
+        } catch (\Exception $e) {
+            // 回滚事务
+            AdminModel::rollback();
+            
             return json([
                 'code' => 500,
-                'msg' => '删除失败',
+                'msg' => '删除失败: ' . $e->getMessage(),
                 'data' => null
             ]);
         }