From 80ee35e957a92e7306eddad4074c87e3cfa87b61 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Tue, 4 Apr 2023 14:44:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=A0=E9=99=A4=E7=9A=84=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyz/playedu/api/service/impl/AdminRoleServiceImpl.java   | 5 +++++
 .../xyz/playedu/api/service/impl/AdminUserServiceImpl.java   | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/xyz/playedu/api/service/impl/AdminRoleServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/AdminRoleServiceImpl.java
index e20279e..5725229 100644
--- a/src/main/java/xyz/playedu/api/service/impl/AdminRoleServiceImpl.java
+++ b/src/main/java/xyz/playedu/api/service/impl/AdminRoleServiceImpl.java
@@ -11,6 +11,7 @@ import xyz.playedu.api.service.internal.AdminRolePermissionService;
 import xyz.playedu.api.service.AdminRoleService;
 import xyz.playedu.api.mapper.AdminRoleMapper;
 import org.springframework.stereotype.Service;
+import xyz.playedu.api.service.internal.AdminUserRoleService;
 import xyz.playedu.api.util.HelperUtil;
 
 import java.util.ArrayList;
@@ -28,6 +29,9 @@ public class AdminRoleServiceImpl extends ServiceImpl<AdminRoleMapper, AdminRole
     @Autowired
     private AdminRolePermissionService rolePermissionService;
 
+    @Autowired
+    private AdminUserRoleService userRoleService;
+
     @Override
     public AdminRole getBySlug(String slug) {
         return getOne(query().getWrapper().eq("slug", slug));
@@ -98,6 +102,7 @@ public class AdminRoleServiceImpl extends ServiceImpl<AdminRoleMapper, AdminRole
     public void removeWithPermissions(AdminRole role) {
         removeRelatePermissionByRoleId(role.getId());
         removeById(role.getId());
+        userRoleService.remove(userRoleService.query().getWrapper().eq("role_id", role.getId()));
     }
 
     @Override
diff --git a/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java
index b193acd..50a17b1 100644
--- a/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java
+++ b/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java
@@ -166,8 +166,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
 
     @Override
     public void removeRelateRolesByUserId(Integer userId) {
-        QueryWrapper<AdminUserRole> wrapper = userRoleService.query().getWrapper().eq("admin_id", userId);
-        userRoleService.remove(wrapper);
+        userRoleService.remove(userRoleService.query().getWrapper().eq("admin_id", userId));
     }
 
     @Override