fix: 删除用户同时删除用户历史密码

continew-org · Jun 24, 2024 · f53d6b6 · f53d6b6
1 parent eb65cff
commit f53d6b6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/...in-system/src/main/java/top/continew/admin/system/service/UserPasswordHistoryService.java b/...in-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<Long> userIds);
+
     /**
      * 密码是否为重复使用
      *

diff --git a/.../src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java b/.../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<Long> userIds) {
+        baseMapper.lambdaUpdate().in(UserPasswordHistoryDO::getUserId, userIds).remove();
+    }
+
     @Override
     public boolean isPasswordReused(Long userId, String password, int count) {
         // 查询近 N 个历史密码

diff --git a/...dmin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java b/...dmin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java
@@ -63,7 +63,6 @@ public boolean add(List<Long> roleIds, Long userId) {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void deleteByUserIds(List<Long> userIds) {
         baseMapper.lambdaUpdate().in(UserRoleDO::getUserId, userIds).remove();
     }

diff --git a/...ew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/...ew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
@@ -345,6 +345,8 @@ public void delete(List<Long> ids) {
             .getNickname());
         // 删除用户和角色关联
         userRoleService.deleteByUserIds(ids);
+        // 删除历史密码
+        userPasswordHistoryService.deleteByUserIds(ids);
         // 删除用户
         super.delete(ids);
     }