Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang

xuhy

2025-03-07 ca8c83c771495363c46b6cfe56a599dfbdbe70d2

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -26,6 +26,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

@@ -192,7 +193,9 @@
        }

        user.setUpdateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        if(StringUtils.isNotEmpty(user.getPassword())){
            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        }
        return AjaxResult.success(userService.updateUser(user));
    }

@@ -241,11 +244,15 @@
    @PutMapping("/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.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));
    }