diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserPasswordHistoryService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/UserPasswordHistoryService.java index f5e8dea1..58cd1eed 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserPasswordHistoryService.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/UserPasswordHistoryService.java @@ -16,6 +16,8 @@ package top.continew.admin.system.service; +import java.util.List; + /** * 用户历史密码业务接口 * @@ -33,6 +35,13 @@ public interface UserPasswordHistoryService { */ void add(Long userId, String password, int count); + /** + * 根据用户 ID 删除 + * + * @param userIds 用户 ID 列表 + */ + void deleteByUserIds(List userIds); + /** * 密码是否为重复使用 * diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java index 58ff5250..3d276843 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java @@ -52,6 +52,11 @@ public void add(Long userId, String password, int count) { baseMapper.deleteExpired(userId, count); } + @Override + public void deleteByUserIds(List userIds) { + baseMapper.lambdaUpdate().in(UserPasswordHistoryDO::getUserId, userIds).remove(); + } + @Override public boolean isPasswordReused(Long userId, String password, int count) { // 查询近 N 个历史密码 diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java index e5f981fe..94d07498 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java @@ -63,7 +63,6 @@ public boolean add(List roleIds, Long userId) { } @Override - @Transactional(rollbackFor = Exception.class) public void deleteByUserIds(List userIds) { baseMapper.lambdaUpdate().in(UserRoleDO::getUserId, userIds).remove(); } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index 4442e32c..b75200f6 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -345,6 +345,8 @@ public void delete(List ids) { .getNickname()); // 删除用户和角色关联 userRoleService.deleteByUserIds(ids); + // 删除历史密码 + userPasswordHistoryService.deleteByUserIds(ids); // 删除用户 super.delete(ids); }