sysuercontroller remove self 问题修复

duandazhi

2021-07-28 dd70c1950ebb0090a95d156aa857ccdc991875a2

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -3,9 +3,11 @@
import java.io.IOException;

import java.util.List;

import java.util.Set;

import java.util.stream.Collectors;

import javax.servlet.http.HttpServletResponse;



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;

import org.springframework.web.bind.annotation.DeleteMapping;

import org.springframework.web.bind.annotation.GetMapping;

@@ -18,6 +20,7 @@
import org.springframework.web.multipart.MultipartFile;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.domain.R;

import com.ruoyi.common.core.utils.SecurityUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.utils.poi.ExcelUtil;

import com.ruoyi.common.core.web.controller.BaseController;

@@ -25,9 +28,10 @@
import com.ruoyi.common.core.web.page.TableDataInfo;

import com.ruoyi.common.log.annotation.Log;

import com.ruoyi.common.log.enums.BusinessType;

import com.ruoyi.common.security.utils.SecurityUtils;

import com.ruoyi.common.security.annotation.PreAuthorize;

import com.ruoyi.system.api.domain.SysRole;

import com.ruoyi.system.api.domain.SysUser;

import com.ruoyi.system.api.model.UserInfo;

import com.ruoyi.system.api.model.LoginUser;

import com.ruoyi.system.service.ISysPermissionService;

import com.ruoyi.system.service.ISysPostService;

import com.ruoyi.system.service.ISysRoleService;

@@ -57,7 +61,7 @@
    /**

     * 获取用户列表

     */

    @PreAuthorize("@ss.hasPermi('system:user:list')")

    @PreAuthorize(hasPermi = "system:user:list")

    @GetMapping("/list")

    public TableDataInfo list(SysUser user)

    {

@@ -67,7 +71,7 @@
    }



    @Log(title = "用户管理", businessType = BusinessType.EXPORT)

    @PreAuthorize("@ss.hasPermi('system:user:export')")

    @PreAuthorize(hasPermi = "system:user:export")

    @PostMapping("/export")

    public void export(HttpServletResponse response, SysUser user) throws IOException

    {

@@ -77,7 +81,7 @@
    }



    @Log(title = "用户管理", businessType = BusinessType.IMPORT)

    @PreAuthorize("@ss.hasPermi('system:user:import')")

    @PreAuthorize(hasPermi = "system:user:import")

    @PostMapping("/importData")

    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception

    {

@@ -99,18 +103,18 @@
     * 获取当前用户信息

     */

    @GetMapping("/info/{username}")

    public R<UserInfo> info(@PathVariable("username") String username)

    public R<LoginUser> info(@PathVariable("username") String username)

    {

        SysUser sysUser = userService.selectUserByUserName(username);

        if (StringUtils.isNull(sysUser))

        {

            return R.failed("用户名或密码错误");

            return R.fail("用户名或密码错误");

        }

        // 角色集合

        Set<String> roles = permissionService.getRolePermission(sysUser.getUserId());

        // 权限集合

        Set<String> permissions = permissionService.getMenuPermission(sysUser.getUserId());

        UserInfo sysUserVo = new UserInfo();

        LoginUser sysUserVo = new LoginUser();

        sysUserVo.setSysUser(sysUser);

        sysUserVo.setRoles(roles);

        sysUserVo.setPermissions(permissions);

@@ -125,7 +129,7 @@
    @GetMapping("getInfo")

    public AjaxResult getInfo()

    {

        Long userId = SecurityUtils.getLoginUser().getUserId();

        Long userId = SecurityUtils.getUserId();

        // 角色集合

        Set<String> roles = permissionService.getRolePermission(userId);

        // 权限集合

@@ -140,12 +144,13 @@
    /**

     * 根据用户编号获取详细信息

     */

    @PreAuthorize("@ss.hasPermi('system:user:query')")

    @PreAuthorize(hasPermi = "system:user:query")

    @GetMapping(value = { "/", "/{userId}" })

    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)

    {

        AjaxResult ajax = AjaxResult.success();

        ajax.put("roles", roleService.selectRoleAll());

        List<SysRole> roles = roleService.selectRoleAll();

        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));

        ajax.put("posts", postService.selectPostAll());

        if (StringUtils.isNotNull(userId))

        {

@@ -159,7 +164,7 @@
    /**

     * 新增用户

     */

    @PreAuthorize("@ss.hasPermi('system:user:add')")

    @PreAuthorize(hasPermi = "system:user:add")

    @Log(title = "用户管理", businessType = BusinessType.INSERT)

    @PostMapping

    public AjaxResult add(@Validated @RequestBody SysUser user)

@@ -168,11 +173,13 @@
        {

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

        }

        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))

        else if (StringUtils.isNotEmpty(user.getPhonenumber())

                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))

        {

            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");

        }

        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))

        else if (StringUtils.isNotEmpty(user.getEmail())

                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))

        {

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

        }

@@ -184,17 +191,19 @@
    /**

     * 修改用户

     */

    @PreAuthorize("@ss.hasPermi('system:user:edit')")

    @PreAuthorize(hasPermi = "system:user:edit")

    @Log(title = "用户管理", businessType = BusinessType.UPDATE)

    @PutMapping

    public AjaxResult edit(@Validated @RequestBody SysUser user)

    {

        userService.checkUserAllowed(user);

        if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))

        if (StringUtils.isNotEmpty(user.getPhonenumber())

                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))

        {

            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");

        }

        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))

        else if (StringUtils.isNotEmpty(user.getEmail())

                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))

        {

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

        }

@@ -205,18 +214,21 @@
    /**

     * 删除用户

     */

    @PreAuthorize("@ss.hasPermi('system:user:remove')")

    @PreAuthorize(hasPermi = "system:user:remove")

    @Log(title = "用户管理", businessType = BusinessType.DELETE)

    @DeleteMapping("/{userIds}")

    public AjaxResult remove(@PathVariable Long[] userIds)

    {

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

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

        }

        return toAjax(userService.deleteUserByIds(userIds));

    }



    /**

     * 重置密码

     */

    @PreAuthorize("@ss.hasPermi('system:user:edit')")

    @PreAuthorize(hasPermi = "system:user:edit")

    @Log(title = "用户管理", businessType = BusinessType.UPDATE)

    @PutMapping("/resetPwd")

    public AjaxResult resetPwd(@RequestBody SysUser user)

@@ -230,7 +242,7 @@
    /**

     * 状态修改

     */

    @PreAuthorize("@ss.hasPermi('system:user:edit')")

    @PreAuthorize(hasPermi = "system:user:edit")

    @Log(title = "用户管理", businessType = BusinessType.UPDATE)

    @PutMapping("/changeStatus")

    public AjaxResult changeStatus(@RequestBody SysUser user)

@@ -239,4 +251,31 @@
        user.setUpdateBy(SecurityUtils.getUsername());

        return toAjax(userService.updateUserStatus(user));

    }



    /**

     * 根据用户编号获取授权角色

     */

    @PreAuthorize(hasPermi = "system:user:query")

    @GetMapping("/authRole/{userId}")

    public AjaxResult authRole(@PathVariable("userId") Long userId)

    {

        AjaxResult ajax = AjaxResult.success();

        SysUser user = userService.selectUserById(userId);

        List<SysRole> roles = roleService.selectRolesByUserId(userId);

        ajax.put("user", user);

        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));

        return ajax;

    }



    /**

     * 用户授权角色

     */

    @PreAuthorize(hasPermi = "system:user:edit")

    @Log(title = "用户管理", businessType = BusinessType.GRANT)

    @PutMapping("/authRole")

    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)

    {

        userService.insertUserAuth(userId, roleIds);

        return success();

    }

}