diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleGroupVO.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleGroupVO.java index fb640369..1286efc8 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleGroupVO.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleGroupVO.java @@ -36,6 +36,16 @@ public class SaasRoleGroupVO { */ private List roleIds; + /** + * 工作台id(自定义时传入) + */ + private Long workspaceId; + + /** + * 单位id(自定义时传入) + */ + private Long ouId; + /** * 排序 */ diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java index 2e12c9b2..a5eaff8c 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java @@ -85,6 +85,8 @@ public class SaasRoleGroupServiceImpl implements SaasRoleGroupService { saasRoleGroup.setOuTypeCode(ouTypeCodeStr); saasRoleGroup.setName(req.getName()); saasRoleGroup.setSort(req.getSort()); + saasRoleGroup.setWorkspaceId(req.getWorkspaceId() != null ? req.getWorkspaceId():-1l); + saasRoleGroup.setOuId(req.getOuId() != null ? req.getOuId():-1l); saasRoleGroupDao.saveOrUpdate(saasRoleGroup); }