huliguo
2025-07-03 e3a2245265516fef78b4737d6fffc939e7c5e0af
pt-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -77,7 +77,7 @@
    @ApiOperation(value = "角色管理-分页列表", tags = "系统后台-权限管理")
    public R<IPage<SysRolePageVO>> page(@RequestParam(value = "pageNum",defaultValue = "0")Integer pageNum,
                                        @RequestParam(value = "pageSize",defaultValue="10")Integer pageSize,
                                        @RequestParam(value = "name",required = false)String name) {
                                        @RequestParam(value = "roleName",required = false)String name) {
        IPage<SysRolePageVO> iPage = new Page<>(pageNum, pageSize);
        return R.ok(roleService.page(iPage,name));
    }
@@ -142,11 +142,14 @@
    @Log(title = "角色管理", businessType = BusinessType.INSERT)
    @PutMapping("/edit")
    public R<Void> edit(@Valid @RequestBody EditSysRoleDTO dto) {
        if (dto.getRoleId()==2){
            return R.fail("超级管理员不能修改");
        }
        roleService.edit(dto);
        // 更新缓存用户权限
        LoginUser loginUser = getLoginUser();
        if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
            loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
            loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getPhonenumber()));
            loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
            tokenService.setLoginUser(loginUser);
        }
@@ -213,6 +216,9 @@
    @Log(title = "角色管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{roleId}")
    public R<Void> remove(@PathVariable Long roleId) {
        if (roleId==2){
            return R.fail("超级管理员不能删除");
        }
        roleService.deleteRoleById(roleId);
        return R.ok();
    }