From 2274ca7010ff4675dd0fcbafb559f3737d75e2d9 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 18 Jul 2025 16:52:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/service/pc/impl/AdminUserServiceImpl.java  | 12 +++++++++---
 src/main/resources/mapper/AdminUserMapper.xml        |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/AdminUserServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/AdminUserServiceImpl.java
index d9118f1..1e58f0a 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/AdminUserServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/AdminUserServiceImpl.java
@@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.ZoneId;
 import java.util.ArrayList;
@@ -58,12 +59,17 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     @Override
     public ApiResponse addOrUpdate(AddOrUpdateAdminUserReqVO addOrUpdateAdminUserReqVO) {
-        addOrUpdateAdminUserReqVO.setPassword(DigestUtil.md5Hex(addOrUpdateAdminUserReqVO.getPassword()));
+        if (StringUtils.isNotBlank(addOrUpdateAdminUserReqVO.getPassword())) {
+            addOrUpdateAdminUserReqVO.setPassword(DigestUtil.md5Hex(addOrUpdateAdminUserReqVO.getPassword()));
+        } else {
+            addOrUpdateAdminUserReqVO.setPassword(null);
+        }
         String id = addOrUpdateAdminUserReqVO.getId();
         if (StringUtils.isBlank(id)) {
             addOrUpdateAdminUserReqVO.setId(SnowFlakeUtil.getId());
-//            String password = addOrUpdateAdminUserReqVO.getPassword();
-//            addOrUpdateAdminUserReqVO.setPassword(password);
+            if (StringUtils.isBlank(addOrUpdateAdminUserReqVO.getPassword())) {
+                return ApiResponse.fail("密码不能为空");
+            }
             int add = adminUserMapper.add(addOrUpdateAdminUserReqVO);
             if (add > 0) {
                 return ApiResponse.success(null);
diff --git a/src/main/resources/mapper/AdminUserMapper.xml b/src/main/resources/mapper/AdminUserMapper.xml
index 8604564..71dd6b7 100644
--- a/src/main/resources/mapper/AdminUserMapper.xml
+++ b/src/main/resources/mapper/AdminUserMapper.xml
@@ -28,6 +28,7 @@
     <update id="update" parameterType="com.ycwl.basic.model.pc.adminUser.req.AddOrUpdateAdminUserReqVO">
         update admin_user
         set `role_id`  =#{roleId}, `account`=#{account}, `name`=#{name}, `phone`=#{phone}
+        <if test="password != null">, `password`=#{password}</if>, update_at = NOW()
         where id = #{id}
     </update>
     <update id="updatePassword">