From c92aa3899e11a355cddfcfeaececcc843d7ad1bb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 九月 2024 19:14:18 +0800
Subject: [PATCH] 修改

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 28a5868..665f042 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -659,7 +659,8 @@
 
     @Override
     public void updateAccount(TShopDTO dto) {
-        SysUser sysUser = this.selectUserByUserName(dto.getAccount());
+//        SysUser sysUser = this.selectUserByUserName(dto.getAccount());
+        SysUser sysUser = this.selectUserById(dto.getUserId());
         if(Objects.isNull(sysUser)){
             throw new ServiceException("未查询到该账号");
         }
@@ -670,7 +671,10 @@
         }else {
             sysUser.setRoleType(3);
         }
-        sysUser.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+        if(Objects.nonNull(dto.getPassword())){
+            sysUser.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+        }
+        sysUser.setStatus(dto.getAccountStatus());
         this.updateUser(sysUser);
     }
 

--
Gitblit v1.7.1