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 d9432ef1..7afc7c11 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 @@ -14,4 +14,11 @@ public class TreeRoleReq { private String workspaceTypeCode; private Boolean needRole; + + private Integer workspaceType; + + /** + * '是否显示' + */ + private Boolean isDisplay; } \ No newline at end of file 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 8b8740e5..522bbcd1 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 @@ -314,8 +314,10 @@ public class SaasRoleController implements TyrSaasRoleApi { List saasRoleGroupRelations = saasRoleGroupRelationDao.getByGroupIds(roleGroupIds); Map saasRoles = roleService.list(RoleService.ListSaasRoleParam.builder() - .roleIds(Lists.transform(saasRoleGroupRelations, SaasRoleGroupRelation::getRoleId)) - .build()) + .roleIds(Lists.transform(saasRoleGroupRelations, SaasRoleGroupRelation::getRoleId)) + .isDisplay(req.getIsDisplay()) + .workspaceType(req.getWorkspaceType()) + .build()) .stream() .collect(Collectors.toMap(SaasRoleRes::getId, Function.identity())); diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java index 9108837f..69af777c 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java @@ -136,6 +136,12 @@ public interface RoleService extends IService { @CriteriaField(field = "id", operator = Operator.IN) private List roleIds; + @CriteriaField(field = "workspaceType", operator = Operator.EQ) + private Integer workspaceType; + + @CriteriaField(field = "isDisplay", operator = Operator.EQ) + private Boolean isDisplay; + @CriteriaField(ignore = true) private Boolean needPermission;