gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【8.0】【sys】更新角色绑定的数据范围逻辑

pull/57/head
fengshuonan 2023-07-18 23:49:05 +08:00
parent 8f1b102fc6
commit 3ee655a874
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java
View File

@ -107,6 +107,11 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl<SysRoleDataScopeMap
@Transactional(rollbackFor = Exception.class)
public void updateRoleBindDataScope(RoleBindDataScopeRequest roleBindDataScopeRequest) {
// 无论角色是否绑定的是指定部门，清空掉角色绑定的数据范围
LambdaQueryWrapper<SysRoleDataScope> removeWrapper = new LambdaQueryWrapper<>();
removeWrapper.eq(SysRoleDataScope::getRoleId, roleBindDataScopeRequest.getRoleId());
this.remove(removeWrapper);
// 更新角色的数据权限类型
Integer dataScopeType = roleBindDataScopeRequest.getDataScopeType();
this.sysRoleService.updateRoleDataScopeType(roleBindDataScopeRequest.getRoleId(), dataScopeType);
@ -122,11 +127,6 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl<SysRoleDataScopeMap
return;
}
// 先清空所有绑定，再添加所有绑定
LambdaQueryWrapper<SysRoleDataScope> removeWrapper = new LambdaQueryWrapper<>();
removeWrapper.eq(SysRoleDataScope::getRoleId, roleBindDataScopeRequest.getRoleId());
this.remove(removeWrapper);
ArrayList<SysRoleDataScope> bindRoleDataScopeList = new ArrayList<>();
for (Long orgId : orgIdList) {
SysRoleDataScope sysRoleDataScope = new SysRoleDataScope();
@ -140,7 +140,7 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl<SysRoleDataScopeMap
@Override
public Set<Long> getRoleBindOrgIdList(List<Long> roleIdList) {
if(ObjectUtil.isEmpty(roleIdList)){
if (ObjectUtil.isEmpty(roleIdList)) {
return new HashSet<>();
}