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

【8.1.1】【sys】调整数据范围

pull/60/head
fengshuonan 2024-03-01 17:38:45 +08:00
parent f0abf7f0c3
commit 07cb03ac8b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
View File

@ -229,7 +229,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
} }
@Override @Override
@DataScope @DataScope(userIdFieldName = "create_user")
public CommonOrgTreeResponse commonOrgTree(CommonOrgTreeRequest commonOrgTreeRequest) { public CommonOrgTreeResponse commonOrgTree(CommonOrgTreeRequest commonOrgTreeRequest) {
// 如果查询带组织机构名称的搜索，则清空其他条件 // 如果查询带组织机构名称的搜索，则清空其他条件

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

@ -54,7 +54,7 @@ public class UserRoleDataScopeImpl implements UserRoleDataScopeApi {
// 如果这个角色列表大于1，也就是不单纯是普通角色，则将普通角色去掉，以配置的角色为主 // 如果这个角色列表大于1，也就是不单纯是普通角色，则将普通角色去掉，以配置的角色为主
Long defaultRoleId = sysRoleService.getDefaultRoleId(); Long defaultRoleId = sysRoleService.getDefaultRoleId();
if (CollectionUtil.contains(userRoleIdList, defaultRoleId)) { if (userRoleIdList.size() > 1 && CollectionUtil.contains(userRoleIdList, defaultRoleId)) {
userRoleIdList.remove(defaultRoleId); userRoleIdList.remove(defaultRoleId);
} }