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 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 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 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