From cdfdf483d6840c692e6ff8cd710fe2ac6656b1c9 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 27 Aug 2021 16:25:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=AE=A1=E7=90=86=E5=91=98=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/src/main/java/cn/lili/common/enums/ResultCode.java | 2 +-
 .../modules/permission/serviceimpl/AdminUserServiceImpl.java | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
index 8ee1d411..c7384ecd 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
@@ -17,7 +17,7 @@ public enum ResultCode {
     /**
      * 失败返回码
      */
-    ERROR(400, "业务异常，请核对问题后进行重试"),
+    ERROR(400, "服务器繁忙，请稍后重试"),
 
     /**
      * 失败返回码
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
index c6361bb2..25e9d426 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
@@ -236,6 +236,11 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
      * @param roles  角色id集合
      */
     private void updateRole(String userId, List<String> roles) {
+
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("user_id", userId);
+        userRoleService.remove(queryWrapper);
+
         if (roles.isEmpty() || roles == null) {
             return;
         }