From 2e215ab320387699af31a57b84f0f98e092db316 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Thu, 23 Mar 2023 22:20:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E3=80=81=E8=8F=9C=E5=8D=95=E3=80=81=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E3=80=81=E7=94=A8=E6=88=B7=E5=88=A0=E9=99=A4=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E9=A1=BA=E5=BA=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=85=88=E5=88=A0=E9=99=A4=E5=85=B3=E8=81=94=E5=86=8D=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B8=BB=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cnadmin/system/service/impl/DeptServiceImpl.java      | 8 ++++----
 .../cnadmin/system/service/impl/MenuServiceImpl.java      | 2 +-
 .../cnadmin/system/service/impl/RoleServiceImpl.java      | 4 ++--
 .../cnadmin/system/service/impl/UserServiceImpl.java      | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
index 9252d335..aacd0235 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
@@ -109,12 +109,12 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptVO,
             isSystemData.orElseGet(DeptDO::new).getName());
         CheckUtils.throwIf(userService.countByDeptIds(ids) > 0, "所选部门存在用户关联，请解除关联后重试");
 
-        // 删除部门
-        super.delete(ids);
-        // 删除子部门
-        baseMapper.lambdaUpdate().in(DeptDO::getParentId, ids).remove();
         // 删除角色和部门关联
         roleDeptService.deleteByDeptIds(ids);
+        // 删除子部门
+        baseMapper.lambdaUpdate().in(DeptDO::getParentId, ids).remove();
+        // 删除部门
+        super.delete(ids);
     }
 
     @Override
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java
index 2578cbd3..f42788cf 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java
@@ -70,8 +70,8 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuVO,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(List<Long> ids) {
-        super.delete(ids);
         baseMapper.lambdaUpdate().in(MenuDO::getParentId, ids).remove();
+        super.delete(ids);
     }
 
     @Override
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
index 564d73e9..973de0a7 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
@@ -114,12 +114,12 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleVO,
             isSystemData.orElseGet(RoleDO::new).getName());
         CheckUtils.throwIf(userRoleService.countByRoleIds(ids) > 0, "所选角色存在用户关联，请解除关联后重试");
 
-        // 删除角色
-        super.delete(ids);
         // 删除角色和菜单关联
         roleMenuService.deleteByRoleIds(ids);
         // 删除角色和部门关联
         roleDeptService.deleteByRoleIds(ids);
+        // 删除角色
+        super.delete(ids);
     }
 
     @Override
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
index 00943bae..1d123e22 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
@@ -125,10 +125,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
         CheckUtils.throwIf(isSystemData::isPresent, "所选用户 [{}] 是系统内置用户，不允许删除",
             isSystemData.orElseGet(UserDO::new).getNickname());
 
-        // 删除用户
-        super.delete(ids);
         // 删除用户和角色关联
         userRoleService.deleteByUserIds(ids);
+        // 删除用户
+        super.delete(ids);
     }
 
     @Override