bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

rebuildRoleAreaScope

This commit is contained in:
sxu 2025-03-12 14:19:45 +08:00
parent e81c17a318
commit 11148c9932
2 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java
View File

@ -134,6 +134,7 @@ public class SysRoleController extends BaseController
return error("内置角色不允许修改"); return error("内置角色不允许修改");
} }
role.setUpdateBy(SecurityUtils.getUsername()); role.setUpdateBy(SecurityUtils.getUsername());
roleService.rebuildRoleAreaScope(role);
return toAjax(roleService.updateRole(role)); return toAjax(roleService.updateRole(role));
}catch (Exception e){ }catch (Exception e){
logger.error(e.toString(),e); logger.error(e.toString(),e);
@ -152,6 +153,7 @@ public class SysRoleController extends BaseController
try{ try{
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId()); roleService.checkRoleDataScope(role.getRoleId());
roleService.rebuildRoleCanteenScope(role);
return toAjax(roleService.authDataScope(role)); return toAjax(roleService.authDataScope(role));
}catch (Exception e){ }catch (Exception e){
logger.error(e.toString(),e); logger.error(e.toString(),e);
@ -159,39 +161,39 @@ public class SysRoleController extends BaseController
} }
} }
/** // /**
* 修改保存数据权限 // * 修改保存数据权限
*/ // */
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:role:edit")) // @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:role:edit"))
@PostMapping("/roleArea/edit") // @PostMapping("/roleArea/edit")
@SysLog(title = "角色管理", businessType = OperaType.UPDATE,logType = 0,module = "系统管理->角色管理->区域权限",details = "修改权限") // @SysLog(title = "角色管理", businessType = OperaType.UPDATE,logType = 0,module = "系统管理->角色管理->区域权限",details = "修改权限")
public AjaxResult rebuildRoleAreaScope(@RequestBody SysRole role) { // public AjaxResult rebuildRoleAreaScope(@RequestBody SysRole role) {
try{ // try{
roleService.checkRoleAllowed(role); // roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId()); // roleService.checkRoleDataScope(role.getRoleId());
return toAjax(roleService.rebuildRoleAreaScope(role)); // return toAjax(roleService.rebuildRoleAreaScope(role));
}catch (Exception e){ // }catch (Exception e){
logger.error(e.toString(),e); // logger.error(e.toString(),e);
return error(e.getMessage()); // return error(e.getMessage());
} // }
} // }
//
/** // /**
* 修改保存数据权限 // * 修改保存数据权限
*/ // */
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:role:edit")) // @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:role:edit"))
@PostMapping("/roleCanteen/edit") // @PostMapping("/roleCanteen/edit")
@SysLog(title = "角色管理", businessType = OperaType.UPDATE,logType = 0,module = "系统管理->角色管理->食堂权限",details = "修改权限") // @SysLog(title = "角色管理", businessType = OperaType.UPDATE,logType = 0,module = "系统管理->角色管理->食堂权限",details = "修改权限")
public AjaxResult rebuildRoleCanteenScope(@RequestBody SysRole role) { // public AjaxResult rebuildRoleCanteenScope(@RequestBody SysRole role) {
try{ // try{
roleService.checkRoleAllowed(role); // roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId()); // roleService.checkRoleDataScope(role.getRoleId());
return toAjax(roleService.rebuildRoleCanteenScope(role)); // return toAjax(roleService.rebuildRoleCanteenScope(role));
}catch (Exception e){ // }catch (Exception e){
logger.error(e.toString(),e); // logger.error(e.toString(),e);
return error(e.getMessage()); // return error(e.getMessage());
} // }
} // }
/** /**
* 状态修改 * 状态修改

1
bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java
View File

@ -267,6 +267,7 @@ public class SysRoleServiceImpl implements ISysRoleService
// 新增角色信息 // 新增角色信息
role.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); role.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
roleMapper.insertRole(role); roleMapper.insertRole(role);
insertRoleArea(role);
return insertRoleMenu(role); return insertRoleMenu(role);
} }