wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/FIX-631' into dev

Browse Source
This commit is contained in:
zhansihu 2023-11-08 16:41:20 +08:00
commit c7260e39f0
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
View File

@ -63,7 +63,7 @@ public interface SaasRoleUserService {
*/ */
List<SuperAminInfoResp> batchSuperAdminList(List<SuperAdminParam> param); List<SuperAminInfoResp> batchSuperAdminList(List<SuperAdminParam> param);
List<SaasRoleUserRelation> listByRoleIds(List<Long> roleIds, Long workspaceId); List<SaasRoleUserRelation> listByRoleIds(List<Long> roleIds, Long ouId, Long workspaceId);
/** /**
* 删除单位参与的工作台的所有的人员与角色。 目前主要是用于移除参与单位的地方 * 删除单位参与的工作台的所有的人员与角色。 目前主要是用于移除参与单位的地方

3
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
View File

@ -227,11 +227,12 @@ public class RoleUserService implements SaasRoleUserService {
} }
@Override @Override
public List<SaasRoleUserRelation> listByRoleIds(List<Long> roleIds, Long workspaceId) { public List<SaasRoleUserRelation> listByRoleIds(List<Long> roleIds, Long ouId, Long workspaceId) {
if (CollectionUtil.isEmpty(roleIds)) { if (CollectionUtil.isEmpty(roleIds)) {
return new ArrayList<>(); return new ArrayList<>();
} }
return roleUserRelationDao.list(new LambdaQueryWrapper<SaasRoleUserRelation>() return roleUserRelationDao.list(new LambdaQueryWrapper<SaasRoleUserRelation>()
.eq(SaasRoleUserRelation::getOuId, ouId)
.eq(SaasRoleUserRelation::getWorkspaceId, workspaceId) .eq(SaasRoleUserRelation::getWorkspaceId, workspaceId)
.in(SaasRoleUserRelation::getRoleId, roleIds)); .in(SaasRoleUserRelation::getRoleId, roleIds));
} }

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
View File

@ -625,7 +625,7 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
return Collections.emptyList(); return Collections.emptyList();
} }
List<SaasRoleUserRelation> relationList = roleUserService.listByRoleIds(matchedRoleIds, workspaceId); List<SaasRoleUserRelation> relationList = roleUserService.listByRoleIds(matchedRoleIds, ouId, workspaceId);
//构建用户-去重(identityId-identityType) //构建用户-去重(identityId-identityType)
List<ListIdentityFromPermissionResp.UserVO> users = new ArrayList<>(); List<ListIdentityFromPermissionResp.UserVO> users = new ArrayList<>();
Set<String> filterSet = new HashSet<>(); Set<String> filterSet = new HashSet<>();