wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:(REQ-2227) 角色tree接口查询增加查询条件

Browse Source
This commit is contained in:
lilong 2024-04-12 11:47:09 +08:00
parent 93483471c9
commit 6b47280781
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreeRoleReq.java
View File

@ -14,4 +14,11 @@ public class TreeRoleReq {
private String workspaceTypeCode; private String workspaceTypeCode;
private Boolean needRole; private Boolean needRole;
private Integer workspaceType;
/**
* '是否显示'
*/
private Boolean isDisplay;
} }

6
tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
View File

@ -314,8 +314,10 @@ public class SaasRoleController implements TyrSaasRoleApi {
List<SaasRoleGroupRelation> saasRoleGroupRelations = saasRoleGroupRelationDao.getByGroupIds(roleGroupIds); List<SaasRoleGroupRelation> saasRoleGroupRelations = saasRoleGroupRelationDao.getByGroupIds(roleGroupIds);
Map<Long, SaasRoleRes> saasRoles = roleService.list(RoleService.ListSaasRoleParam.builder() Map<Long, SaasRoleRes> saasRoles = roleService.list(RoleService.ListSaasRoleParam.builder()
.roleIds(Lists.transform(saasRoleGroupRelations, SaasRoleGroupRelation::getRoleId)) .roleIds(Lists.transform(saasRoleGroupRelations, SaasRoleGroupRelation::getRoleId))
.build()) .isDisplay(req.getIsDisplay())
.workspaceType(req.getWorkspaceType())
.build())
.stream() .stream()
.collect(Collectors.toMap(SaasRoleRes::getId, Function.identity())); .collect(Collectors.toMap(SaasRoleRes::getId, Function.identity()));

6
tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
View File

@ -136,6 +136,12 @@ public interface RoleService extends IService<SaasRole> {
@CriteriaField(field = "id", operator = Operator.IN) @CriteriaField(field = "id", operator = Operator.IN)
private List<Long> roleIds; private List<Long> roleIds;
@CriteriaField(field = "workspaceType", operator = Operator.EQ)
private Integer workspaceType;
@CriteriaField(field = "isDisplay", operator = Operator.EQ)
private Boolean isDisplay;
@CriteriaField(ignore = true) @CriteriaField(ignore = true)
private Boolean needPermission; private Boolean needPermission;