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

feat(2046-permission): 小组类型按班组类型处理

Browse Source
This commit is contained in:
zhansihu 2024-01-23 12:01:00 +08:00
parent 716034a1ca
commit f864fbe6e9
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/WorkspaceJoinType.java
View File

@ -14,7 +14,8 @@ import java.util.EnumSet;
/**
* 单位与工作台的参建类型
*
* 与协同关系保持一致
* cn.axzo.maokai.common.enums.SaasCooperateShipCooperateTypeEnum
* @author tanjie@axzo.cn
* @date 2023/10/13 17:55
*/
@ -31,6 +32,9 @@ public enum WorkspaceJoinType implements IBaseCreateEnum<WorkspaceJoinType> {
ENT_GENERAL(7, "企业通用"),
ENT_TEAM(8, "企业班组"),
PROJ_TEAM(9, "项目班组"),
ENT_GROUP(10, "企业小组"),
PROJ_GROUP(11, "项目小组"),
OTHER(30, "其他"),
;
@EnumValue
@JsonValue

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

@ -18,6 +18,11 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import static cn.axzo.tyr.client.common.enums.WorkspaceJoinType.ENT_GROUP;
import static cn.axzo.tyr.client.common.enums.WorkspaceJoinType.ENT_TEAM;
import static cn.axzo.tyr.client.common.enums.WorkspaceJoinType.PROJ_GROUP;
import static cn.axzo.tyr.client.common.enums.WorkspaceJoinType.PROJ_TEAM;
/**
* @author tanjie@axzo.cn
* @date 2023/10/13 15:23
@ -87,6 +92,18 @@ public class IdentityAuthReq {
*/
@NotNull
private Integer workspaceJoinType;
public Integer convertGetJoinType() {
if (ENT_GROUP.getValue().equals(this.workspaceJoinType)) {
//平台小组类型 -> 平台班组
return ENT_TEAM.getValue();
}
if (PROJ_GROUP.getValue().equals(this.getWorkspaceJoinType())) {
//项目小组 -> 项目班组
return PROJ_TEAM.getValue();
}
return this.workspaceJoinType;
}
}
}

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

@ -510,7 +510,7 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
owRoleInfo.setRoles(roles.stream()
.filter(r -> owRoleIds.contains(r.getId()))
.filter(r -> r.getProductUnitType() == null
|| ow.getWorkspaceJoinType().equals(r.getProductUnitType())) //匹配标签
|| ow.convertGetJoinType().equals(r.getProductUnitType())) //匹配标签
.collect(Collectors.toSet()));
}
owRoleMap.add(owRoleInfo);