From c3b6c88471a67342ee0531d0f4de3b1c60bf5c03 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 6 Aug 2021 12:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=A4=E5=AE=9A=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/AdminUserServiceImpl.java           | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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 b4b56844..c6361bb2 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
@@ -157,15 +157,20 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
     @Override
     @SystemLogPoint(description = "修改管理员", customerLog = "'修改管理员:'+#adminUser.username")
     public boolean updateAdminUser(AdminUser adminUser, List<String> roles) {
-        if (roles.size() > rolesMaxSize) {
-            throw new ServiceException(ResultCode.PERMISSION_BEYOND_TEN);
-        }
+
         if (roles != null && roles.size() > 0) {
+
+            if (roles.size() > rolesMaxSize) {
+                throw new ServiceException(ResultCode.PERMISSION_BEYOND_TEN);
+            }
             adminUser.setRoleIds(StringUtils.join(",", roles));
+
+        } else {
+            adminUser.setRoleIds("");
         }
 
-        this.updateById(adminUser);
         updateRole(adminUser.getId(), roles);
+        this.updateById(adminUser);
         return true;
     }