diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreeRoleReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreeRoleReq.java index 9216fdcf..ea58c415 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreeRoleReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreeRoleReq.java @@ -15,10 +15,17 @@ import java.util.Set; @AllArgsConstructor public class TreeRoleReq { + /** + * 跟workspaceType一样的效果,以前不知道saasRole上的workspaceType跟其他的workspaceTypeCode是否是一个值 + */ private String workspaceTypeCode; private Boolean needRole; + /** + * 请使用workspaceTypeCode,已经不再使用 + */ + @Deprecated private Integer workspaceType; /** diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java index f2023544..3f0f5060 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java @@ -473,6 +473,8 @@ public class SaasRoleController implements TyrSaasRoleApi { .idStr(role.getId() + ":" + ROLE_TYPE) .isDisplay(role.getIsDisplay()) .code(role.getRoleCode()) + .workspaceId(role.getWorkspaceId()) + .ouId(role.getOwnerOuId()) .build(); }