优化用户不能删除自己

RuoYi

2021-08-08 324342800985a3e543a6ce308daeb219bdfbada0

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

@@ -17,15 +17,16 @@
import com.ruoyi.common.core.controller.BaseController;

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

import com.ruoyi.common.core.domain.entity.SysRole;

import com.ruoyi.common.core.domain.entity.SysUser;

import com.ruoyi.common.core.domain.model.LoginUser;

import com.ruoyi.common.core.page.TableDataInfo;

import com.ruoyi.common.enums.BusinessType;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.ServletUtils;

import com.ruoyi.common.utils.StringUtils;

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

import com.ruoyi.framework.web.service.SysPermissionService;

import com.ruoyi.framework.web.service.TokenService;

import com.ruoyi.system.domain.SysUserRole;

import com.ruoyi.system.service.ISysRoleService;

import com.ruoyi.system.service.ISysUserService;



@@ -95,7 +96,7 @@
        {

            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");

        }

        role.setCreateBy(SecurityUtils.getUsername());

        role.setCreateBy(getUsername());

        return toAjax(roleService.insertRole(role));



    }

@@ -117,7 +118,7 @@
        {

            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");

        }

        role.setUpdateBy(SecurityUtils.getUsername());

        role.setUpdateBy(getUsername());

        

        if (roleService.updateRole(role) > 0)

        {

@@ -155,7 +156,7 @@
    public AjaxResult changeStatus(@RequestBody SysRole role)

    {

        roleService.checkRoleAllowed(role);

        role.setUpdateBy(SecurityUtils.getUsername());

        role.setUpdateBy(getUsername());

        return toAjax(roleService.updateRoleStatus(role));

    }



@@ -179,4 +180,61 @@
    {

        return AjaxResult.success(roleService.selectRoleAll());

    }



    /**

     * 查询已分配用户角色列表

     */

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

    @GetMapping("/authUser/allocatedList")

    public TableDataInfo allocatedList(SysUser user)

    {

        startPage();

        List<SysUser> list = userService.selectAllocatedList(user);

        return getDataTable(list);

    }



    /**

     * 查询未分配用户角色列表

     */

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

    @GetMapping("/authUser/unallocatedList")

    public TableDataInfo unallocatedList(SysUser user)

    {

        startPage();

        List<SysUser> list = userService.selectUnallocatedList(user);

        return getDataTable(list);

    }



    /**

     * 取消授权用户

     */

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

    @Log(title = "角色管理", businessType = BusinessType.GRANT)

    @PutMapping("/authUser/cancel")

    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)

    {

        return toAjax(roleService.deleteAuthUser(userRole));

    }



    /**

     * 批量取消授权用户

     */

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

    @Log(title = "角色管理", businessType = BusinessType.GRANT)

    @PutMapping("/authUser/cancelAll")

    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)

    {

        return toAjax(roleService.deleteAuthUsers(roleId, userIds));

    }



    /**

     * 批量选择用户授权

     */

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

    @Log(title = "角色管理", businessType = BusinessType.GRANT)

    @PutMapping("/authUser/selectAll")

    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)

    {

        return toAjax(roleService.insertAuthUsers(roleId, userIds));

    }

}