优化用户不能删除自己

RuoYi

2021-08-08 29b5c5daf33344ee1b1b93b1b5a2c8ffd3f73f8f

 src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -2,6 +2,7 @@


import java.util.List;

import java.util.stream.Collectors;

import org.apache.commons.lang3.ArrayUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.validation.annotation.Validated;

@@ -137,7 +138,7 @@
        {

            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");

        }

        user.setCreateBy(SecurityUtils.getUsername());

        user.setCreateBy(getUsername());

        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));

        return toAjax(userService.insertUser(user));

    }

@@ -161,7 +162,7 @@
        {

            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");

        }

        user.setUpdateBy(SecurityUtils.getUsername());

        user.setUpdateBy(getUsername());

        return toAjax(userService.updateUser(user));

    }



@@ -173,6 +174,10 @@
    @DeleteMapping("/{userIds}")

    public AjaxResult remove(@PathVariable Long[] userIds)

    {

        if (ArrayUtils.contains(userIds, getUserId()))

        {

            return error("当前用户不能删除");

        }

        return toAjax(userService.deleteUserByIds(userIds));

    }



@@ -186,7 +191,7 @@
    {

        userService.checkUserAllowed(user);

        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));

        user.setUpdateBy(SecurityUtils.getUsername());

        user.setUpdateBy(getUsername());

        return toAjax(userService.resetPwd(user));

    }



@@ -199,7 +204,7 @@
    public AjaxResult changeStatus(@RequestBody SysUser user)

    {

        userService.checkUserAllowed(user);

        user.setUpdateBy(SecurityUtils.getUsername());

        user.setUpdateBy(getUsername());

        return toAjax(userService.updateUserStatus(user));

    }