diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/OUWorkspacePair.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/OUWorkspacePair.java index dc5f1484..ed8ac15d 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/OUWorkspacePair.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/OUWorkspacePair.java @@ -16,6 +16,9 @@ public class OUWorkspacePair { /** 工作台ID **/ @NotNull private Long workspaceId; + /** 工作台类型 **/ + @NotNull + private Integer workspaceType; /** 企业组织ID **/ @NotNull private Long ouId; 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 81f2ed6a..eda8072f 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 @@ -58,6 +58,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; +import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -517,6 +519,8 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService { if (StrUtil.isNotBlank(req.getTerminal())) { request.setTerminal(Collections.singletonList(req.getTerminal())); } + List pairs = BeanMapper.copyList(req.getWorkspaceAndOU(), IdentityAuthReq.WorkspaceOuPair.class); + request.setWorkspaceOusPairs(pairs); IdentityAuthRes authRes = this.findIdentityAuth(request); HashSet codeSet = new HashSet<>(req.getCodes()); //比较code