From ff5b649969921e058dc07ee32f0e3831db55b84c Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Thu, 17 Nov 2022 18:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/service/impl/SystemAuthAdminServiceImpl.java | 10 +++++-----
 .../validate/system/SystemAdminUpInfoValidate.java     |  7 ++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java
index 1f8182f7..5320d16e 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java
@@ -250,7 +250,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
      */
     @Override
     public void edit(SystemAdminUpdateValidate updateValidate, Integer adminId) {
-        if (adminId.equals(1) && updateValidate.getId().equals(1)) {
+        if (!adminId.equals(1) && updateValidate.getId().equals(1)) {
             throw new OperateException("您无权限编辑系统管理员!");
         }
 
@@ -295,7 +295,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
             model.setUsername(updateValidate.getUsername());
         }
 
-        if (StringUtil.isNotNull(updateValidate.getPassword())) {
+        if (StringUtil.isNotNull(updateValidate.getPassword()) && StringUtil.isNotEmpty(updateValidate.getPassword())) {
             String salt   = ToolsUtil.randomString(5);
             String pwd    = ToolsUtil.makeMd5( updateValidate.getPassword().trim() + salt);
             model.setPassword(pwd);
@@ -305,7 +305,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
         systemAuthAdminMapper.updateById(model);
         this.cacheAdminUserByUid(updateValidate.getId());
 
-        if (StringUtil.isNotNull(updateValidate.getPassword())) {
+        if (StringUtil.isNotNull(updateValidate.getPassword()) && StringUtil.isNotEmpty(updateValidate.getPassword())) {
             StpUtil.kickout(updateValidate.getId());
         }
     }
@@ -334,7 +334,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
         model.setNickname(upInfoValidate.getNickname());
         model.setUpdateTime(System.currentTimeMillis() / 1000);
 
-        if (StringUtil.isNotNull(upInfoValidate.getPassword())) {
+        if (StringUtil.isNotNull(upInfoValidate.getPassword()) && StringUtil.isNotEmpty(upInfoValidate.getPassword())) {
             String currPassword = ToolsUtil.makeMd5(upInfoValidate.getCurrPassword() + model.getSalt());
             Assert.isFalse(!currPassword.equals(model.getPassword()), "当前密码不正确!");
             String salt   = ToolsUtil.randomString(5);
@@ -346,7 +346,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
         systemAuthAdminMapper.updateById(model);
         this.cacheAdminUserByUid(adminId);
 
-        if (StringUtil.isNotNull(upInfoValidate.getPassword())) {
+        if (StringUtil.isNotNull(upInfoValidate.getPassword()) && StringUtil.isNotEmpty(upInfoValidate.getPassword())) {
             StpUtil.kickout(adminId);
         }
     }
diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminUpInfoValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminUpInfoValidate.java
index df60bb47..c42b5ab7 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminUpInfoValidate.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminUpInfoValidate.java
@@ -18,15 +18,12 @@ public class SystemAdminUpInfoValidate implements Serializable {
     @Length(min = 2, max = 30, message = "昵称必须在2~30个字符内")
     private String nickname;
 
-    @Length(min = 6, max = 32, message = "密码必须在6~32个字符内")
+    @Length(max = 32, message = "密码必须在6~32个字符内")
     private String password="";
 
-    @Length(min = 6, max = 32, message = "当前密码错误")
+    @Length(max = 32, message = "当前密码错误")
     private String currPassword="";
 
-    @Length(min = 6, max = 32, message = "旧密码错误")
-    private String oldPassword="";
-
     @Length(max = 200, message = "头像不能超出200个字符")
     private String avatar = "";