bug修改

huliguo

10 天以前 e3a2245265516fef78b4737d6fffc939e7c5e0af

 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);
    }