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

Merge remote-tracking branch 'origin/bonus-houqin' into bonus-houqin

This commit is contained in:
gaowdong 2025-03-18 17:41:44 +08:00
parent 679f403189 02b87a316e
commit 0bc8fbd1e1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,6 +135,7 @@ public class SysRoleController extends BaseController
}
role.setUpdateBy(SecurityUtils.getUsername());
roleService.rebuildRoleAreaScope(role);
roleService.rebuildRoleCanteenScope(role);
return toAjax(roleService.updateRole(role));
}catch (Exception e){
logger.error(e.toString(),e);
@ -153,7 +154,6 @@ public class SysRoleController extends BaseController
try{
roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
roleService.rebuildRoleCanteenScope(role);
return toAjax(roleService.authDataScope(role));
}catch (Exception e){
logger.error(e.toString(),e);

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

@ -275,6 +275,7 @@ public class SysRoleServiceImpl implements ISysRoleService
role.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
roleMapper.insertRole(role);
insertRoleArea(role);
insertRoleCanteen(role);
return insertRoleMenu(role);
}
@ -330,7 +331,7 @@ public class SysRoleServiceImpl implements ISysRoleService
public int rebuildRoleAreaScope(SysRole role)
{
// 修改角色信息
roleMapper.updateRole(role);
//roleMapper.updateRole(role);
// 删除角色与区域关联
roleAreaMapper.deleteRoleAreaByRoleId(role.getRoleId());
// 新增角色和区域信息（数据权限）
@ -342,7 +343,7 @@ public class SysRoleServiceImpl implements ISysRoleService
public int rebuildRoleCanteenScope(SysRole role)
{
// 修改角色信息
roleMapper.updateRole(role);
//roleMapper.updateRole(role);
// 删除角色与食堂档口关联
roleAreaMapper.deleteRoleCanteenByRoleId(role.getRoleId());
// 新增角色和食堂档口信息（数据权限）