From e3a2245265516fef78b4737d6fffc939e7c5e0af Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 03 七月 2025 17:56:07 +0800
Subject: [PATCH] bug修改

---
 pt-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pt-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/pt-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index c19ae56..382b277 100644
--- a/pt-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/pt-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -578,7 +578,7 @@
 
     @Override
     public R<SysUserVO> getInfo(Long userId) {
-        return userMapper.getSysUserVO(userId);
+        return R.ok(userMapper.getSysUserVO(userId));
     }
 
     @Override
@@ -604,7 +604,7 @@
         sysUser.setPhonenumber(dto.getPhonenumber());
         sysUser.setNickName(dto.getNickName());
         //后六位为默认密码
-        sysUser.setPassword(SecurityUtils.encryptPassword(Md5Utils.hash(dto.getPhonenumber().substring(6,12))));
+        sysUser.setPassword(SecurityUtils.encryptPassword(Md5Utils.hash(dto.getPhonenumber().substring(5,11))));
         sysUser.setStatus("0");
         sysUser.setDeptId(dto.getDeptId());  //添加用户-部门关系
         userMapper.insertUser(sysUser);
@@ -665,7 +665,7 @@
         if (sysUser==null){
             throw new ServiceException("该用户不存在");
         }
-        sysUser.setPassword(SecurityUtils.encryptPassword(Md5Utils.hash(sysUser.getPassword().substring(6,12))));
+        sysUser.setPassword(SecurityUtils.encryptPassword(Md5Utils.hash(sysUser.getPhonenumber().substring(5,11))));
         userMapper.updateUser(sysUser);
     }
 
@@ -673,9 +673,10 @@
     public void changeStatus(Long userId) {
         //检查用户是否存在
         SysUser sysUser = userMapper.selectUserById(userId);
-        if (sysUser==null){
+        if (sysUser==null || sysUser.getDelFlag().equals("2")){
             throw new ServiceException("该用户不存在");
         }
+
         sysUser.setStatus(Objects.equals(sysUser.getStatus(), "1") ?"0":"1");
         userMapper.updateUser(sysUser);
     }

--
Gitblit v1.7.1