liujie
2025-11-05 fd7dc732ba009ec8aa8308f3270e5ffdf084f2a7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -14,7 +14,6 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.SysUserUpdateStatusDTO;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysRoleService;
@@ -280,22 +279,22 @@
    /**
     * 状态修改
     */
    @ApiOperation(value = "状态修改")
    @Log(title = "用户信息-状态修改", businessType = BusinessType.UPDATE)
    @PutMapping("/system/user/changeStatus")
    public AjaxResult changeStatus(@RequestBody SysUserUpdateStatusDTO dto)
    {
        SysUser loginUser = tokenService.getLoginUser().getUser();
        SysUser user = new SysUser();
        user.setUserId(dto.getUserId());
        user.setStatus(String.valueOf(dto.getStatus()));
//        user.setRemark(dto.getRemark());
        user.setUpdateBy(getUsername());
        user.setDisableRemark(dto.getRemark());
        user.setOperatingTime(LocalDateTime.now());
        user.setOperatingPerson(loginUser.getNickName()+"("+loginUser.getUserName()+")");
        return AjaxResult.success(userService.updateUserStatus(user));
    }
//    @ApiOperation(value = "状态修改")
//    @Log(title = "用户信息-状态修改", businessType = BusinessType.UPDATE)
//    @PutMapping("/system/user/changeStatus")
//    public AjaxResult changeStatus(@RequestBody SysUserUpdateStatusDTO dto)
//    {
//        SysUser loginUser = tokenService.getLoginUser().getUser();
//        SysUser user = new SysUser();
//        user.setUserId(dto.getUserId());
//        user.setStatus(String.valueOf(dto.getStatus()));
////        user.setRemark(dto.getRemark());
//        user.setUpdateBy(getUsername());
//        user.setDisableRemark(dto.getRemark());
//        user.setOperatingTime(LocalDateTime.now());
//        user.setOperatingPerson(loginUser.getNickName()+"("+loginUser.getUserName()+")");
//        return AjaxResult.success(userService.updateUserStatus(user));
//    }
    /**
     * 根据用户编号获取授权角色