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

Merge remote-tracking branch 'origin/feature/REQ-1650' into feature/REQ-1650

Browse Source
This commit is contained in:
zuoqinbo 2023-12-01 15:40:35 +08:00
commit 1a8cdc41ee
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java
View File

@ -57,7 +57,7 @@ public class IdentityAuthReq {
private Set<String> featureCode = new HashSet<>();
/** 指定角色ID - 预览用，不需要用户已配置角色 **/
private List<Long> specifyRoleIds;
private Set<Long> specifyRoleIds;
@Data

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

@ -329,6 +329,8 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
relation.setWorkspaceId(k.getWorkspaceId());
relation.setIdentityId(identityAuthReq.getIdentityId());
relation.setIdentityType(identityAuthReq.getIdentityType().getCode());
// 使用角色ID替代，不需要在查询一次
relation.setId(id);
return relation;
}).collect(Collectors.toList());
saasRoleUserRelations.addAll(relations);