zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 角色id

V0.5.x
jay 2023-06-12 17:16:25 +08:00
parent e311b9791e
commit 89cb601d6f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java
View File

@ -104,8 +104,8 @@ public class SysRoleController extends BaseController {
public void edit(@Validated @RequestBody Request<SysRoleBo> bo) { public void edit(@Validated @RequestBody Request<SysRoleBo> bo) {
SysRoleBo role = bo.getData(); SysRoleBo role = bo.getData();
roleService.checkRoleAllowed(role.getRoleId()); roleService.checkRoleAllowed(role.getId());
roleService.checkRoleDataScope(role.getRoleId()); roleService.checkRoleDataScope(role.getId());
if (!roleService.checkRoleNameUnique(role)) { if (!roleService.checkRoleNameUnique(role)) {
fail("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); fail("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
} else if (!roleService.checkRoleKeyUnique(role)) { } else if (!roleService.checkRoleKeyUnique(role)) {
@ -113,7 +113,7 @@ public class SysRoleController extends BaseController {
} }
if (roleService.updateRole(role) > 0) { if (roleService.updateRole(role) > 0) {
roleService.cleanOnlineUserByRole(role.getRoleId()); roleService.cleanOnlineUserByRole(role.getId());
} }
fail("修改角色'" + role.getRoleName() + "'失败，请联系管理员"); fail("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
} }
@ -127,8 +127,8 @@ public class SysRoleController extends BaseController {
@PostMapping("/dataScope") @PostMapping("/dataScope")
public void dataScope(@RequestBody Request<SysRoleBo> bo) { public void dataScope(@RequestBody Request<SysRoleBo> bo) {
SysRoleBo role = bo.getData(); SysRoleBo role = bo.getData();
roleService.checkRoleAllowed(role.getRoleId()); roleService.checkRoleAllowed(role.getId());
roleService.checkRoleDataScope(role.getRoleId()); roleService.checkRoleDataScope(role.getId());
roleService.authDataScope(role); roleService.authDataScope(role);
} }
@ -141,9 +141,9 @@ public class SysRoleController extends BaseController {
@PostMapping("/changeStatus") @PostMapping("/changeStatus")
public void changeStatus(@RequestBody Request<SysRoleBo> bo) { public void changeStatus(@RequestBody Request<SysRoleBo> bo) {
SysRoleBo role = bo.getData(); SysRoleBo role = bo.getData();
roleService.checkRoleAllowed(role.getRoleId()); roleService.checkRoleAllowed(role.getId());
roleService.checkRoleDataScope(role.getRoleId()); roleService.checkRoleDataScope(role.getId());
roleService.updateRoleStatus(role.getRoleId(), role.getStatus()); roleService.updateRoleStatus(role.getId(), role.getStatus());
} }
/** /**