修改

xuhy

2025-07-23 79fcd7a7c79c6929032c5c30111c6a8adde8fee1

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

@@ -1,6 +1,5 @@
package com.ruoyi.web.controller.system;

import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.controller.BaseController;
@@ -149,10 +148,9 @@
    // @PreAuthorize("@ss.hasPermi('system:user:add')")
    @ApiOperation(value = "新增用户管理",response = SysUser.class)
    @Log(title = "用户信息-新增用户", businessType = BusinessType.INSERT)
    @PostMapping("/api/system/user/add")
    public R<String> add(@RequestBody String param)
    @PostMapping("/system/user/add")
    public R<String> add(@RequestBody SysUser user)
    {
        SysUser user = JSON.parseObject(param,SysUser.class);
        user.setUserName(user.getUserName());
        if (!userService.checkUserNameUnique(user))
        {
@@ -176,10 +174,9 @@
    // @PreAuthorize("@ss.hasPermi('system:user:edit')")
    @ApiOperation(value = "修改用户管理")
    @Log(title = "用户信息-修改用户", businessType = BusinessType.UPDATE)
    @PostMapping("/api/system/user/edit")
    public R edit(@RequestBody String param)
    @PostMapping("/system/user/edit")
    public R edit(@RequestBody SysUser user)
    {
        SysUser user = JSON.parseObject(param,SysUser.class);
        user.setUserName(user.getPhonenumber());
//        userService.checkUserAllowed(user);
//        userService.checkUserDataScope(user.getUserId());
@@ -198,21 +195,6 @@
        }
        user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
        return R.ok(userService.updateUser(user));
    }

    /**
     * 修改用户签名
     */
    // @PreAuthorize("@ss.hasPermi('system:user:edit')")
    @ApiOperation(value = "修改用户签名")
    @Log(title = "用户信息-修改用户签名", businessType = BusinessType.UPDATE)
    @PostMapping("/api/system/user/editSignPicture")
    public R editSignPicture(@RequestBody String param)
    {
        Long userId = tokenService.getLoginUser().getUserId();
        SysUser user = JSON.parseObject(param,SysUser.class);
        user.setUserId(userId);
        return R.ok(userService.editSignPicture(user));
    }

    /**
@@ -242,10 +224,9 @@
    // @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
    @ApiOperation(value = "重置密码")
    @Log(title = "用户信息-重置密码", businessType = BusinessType.UPDATE)
    @PostMapping("/api/system/user/resetPwd")
    public AjaxResult resetPwd(@RequestBody String param)
    @PostMapping("/system/user/resetPwd")
    public AjaxResult resetPwd(@RequestBody SysUser user)
    {
        SysUser user = JSON.parseObject(param,SysUser.class);
        userService.checkUserAllowed(user);
//        userService.checkUserDataScope(user.getUserId());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));