From f53d6b6504d5d504581e2697589dcb9b8fbe82ef Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 24 Jun 2024 21:17:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/system/service/UserPasswordHistoryService.java | 9 +++++++++
 .../service/impl/UserPasswordHistoryServiceImpl.java     | 5 +++++
 .../admin/system/service/impl/UserRoleServiceImpl.java   | 1 -
 .../admin/system/service/impl/UserServiceImpl.java       | 2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

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<Long> 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<Long> 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<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/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<Long> ids) {
             .getNickname());
         // 删除用户和角色关联
         userRoleService.deleteByUserIds(ids);
+        // 删除历史密码
+        userPasswordHistoryService.deleteByUserIds(ids);
         // 删除用户
         super.delete(ids);
     }