diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/WorkspaceJoinType.java b/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/WorkspaceJoinType.java index b4b62e83..1778fe4e 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/WorkspaceJoinType.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/WorkspaceJoinType.java @@ -19,6 +19,7 @@ import java.util.EnumSet; * @date 2023/10/13 17:55 */ @AllArgsConstructor +@Getter public enum WorkspaceJoinType implements IBaseCreateEnum { PRIMARY_CONTRACTING_UNIT(1, "总包单位"), @@ -30,7 +31,6 @@ public enum WorkspaceJoinType implements IBaseCreateEnum { ENT_GENERAL(7, "企业通用"), ; @EnumValue - @Getter @JsonValue private final Integer value; private final String desc; diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java index 9f0fabba..b68e4f8f 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java @@ -72,8 +72,11 @@ public class IdentityAuthReq { @NotNull private Long ouId; + /** + * 使用{@link WorkspaceJoinType} + */ @NotNull - private WorkspaceJoinType workspaceJoinType; + private Integer workspaceJoinType; } } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java index 6b59adb5..e22b0cca 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java @@ -329,7 +329,7 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService { userRoleInfoMap.setWorkspaceId(e.getWorkspaceId()); userRoleInfoMap.setOuId(e.getOuId()); userRoleInfoMap.setWorkspaceType(e.getWorkspaceType()); - userRoleInfoMap.setWorkspaceJoinType(e.getWorkspaceJoinType()); + userRoleInfoMap.setWorkspaceJoinType(WorkspaceJoinType.matchValue(e.getWorkspaceJoinType())); queryKey.putIfAbsent(KeyUtil.buildKeyBySeparator(e.getWorkspaceId(), e.getOuId()), userRoleInfoMap); }); stopWatch.start("query role user relation");