From e3a2245265516fef78b4737d6fffc939e7c5e0af Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 03 七月 2025 17:56:07 +0800
Subject: [PATCH] bug修改
---
pt-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/pt-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/pt-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 26ff4ad..d1e6a2c 100644
--- a/pt-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/pt-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -43,7 +43,6 @@
*
* @author ruoyi
*/
-@Api(value = "角色管理控制器",tags = "角色管理控制器")
@RestController
@RequestMapping("/system/role")
public class SysRoleController extends BaseController {
@@ -78,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));
}
@@ -125,7 +124,7 @@
return toAjax(roleService.insertRole(role));
}*/
- @ApiOperation(value = "新增角色", notes = "系统后台-权限管理")
+ @ApiOperation(value = "新增角色", tags = "系统后台-权限管理")
@PreAuthorize("@ss.hasPermi('system:role:list')")
@Log(title = "角色管理", businessType = BusinessType.INSERT)
@PostMapping("/add")
@@ -138,16 +137,19 @@
/**
* 修改保存角色
*/
- @ApiOperation(value = "修改角色", notes = "系统后台-权限管理")
+ @ApiOperation(value = "修改角色", tags = "系统后台-权限管理")
@PreAuthorize("@ss.hasPermi('system:role:list')")
@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);
}
@@ -209,18 +211,21 @@
/**
* 删除角色
*/
- @ApiOperation(value = "删除角色", notes = "系统后台-权限管理")
+ @ApiOperation(value = "删除角色", tags = "系统后台-权限管理")
@PreAuthorize("@ss.hasPermi('system:role:list')")
@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();
}
/**
* 查看详情
*/
- @ApiOperation(value = "查看详情", notes = "系统后台-权限管理")
+ @ApiOperation(value = "查看详情", tags = "系统后台-权限管理")
@PreAuthorize("@ss.hasPermi('system:role:list')")
@Log(title = "角色管理", businessType = BusinessType.DELETE)
@GetMapping("/{roleId}")
@@ -233,14 +238,12 @@
/**
* 获取角色选择框列表
*/
-/*
- @ApiOperation(value = "获取角色选择框列表", notes = "获取角色选择框列表")
- @PreAuthorize("@ss.hasPermi('system:role:query')")
- @GetMapping("/optionselect")
- public AjaxResult optionselect() {
- return success(roleService.selectRoleAll());
+ @ApiOperation(value = "账号管理-获取角色下拉框", tags = "系统后台-权限管理")
+ @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/getOptionSelect")
+ public R<List<SysRoleVO>> getOptionSelect() {
+ return R.ok(roleService.getOptionSelect());
}
-*/
/**
* 查询已分配用户角色列表
--
Gitblit v1.7.1