From a231e7e6a0bd961f00b80fe69c091b19c25eda2a Mon Sep 17 00:00:00 2001
From: none <none>
Date: Wed, 15 Mar 2023 16:17:45 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=20=E7=AE=A1=E7=90=86=E5=91=98=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../playedu/api/service/impl/AdminUserServiceImpl.java | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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 c9b188e..9109c20 100644
--- a/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java
+++ b/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java
@@ -130,6 +130,8 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
     public void updateWithRoleIds(AdminUser user, String name, String email, String password, Integer isBanLogin, Integer[] roleIds) throws ServiceException {
         AdminUser updateAdminUser = new AdminUser();
         updateAdminUser.setId(user.getId());
+        updateAdminUser.setName(name);
+        updateAdminUser.setIsBanLogin(isBanLogin);
 
         if (!user.getEmail().equals(email)) {//更换了邮箱
             if (emailExists(email)) {
@@ -142,14 +144,6 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             updateAdminUser.setPassword(HelperUtil.MD5(password + user.getSalt()));
         }
 
-        if (!user.getName().equals(name)) {//更换了姓名
-            updateAdminUser.setName(name);
-        }
-
-        if (!user.getIsBanLogin().equals(isBanLogin)) {
-            updateAdminUser.setIsBanLogin(isBanLogin);
-        }
-
         updateById(updateAdminUser);
 
         resetRelateRoles(user, roleIds);