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

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

Browse Source
This commit is contained in:
lilong 2024-04-18 10:10:24 +08:00
parent 055c69bb01
commit 0465c43acf
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/QuerySaasRoleReq.java
View File

@ -82,6 +82,12 @@ public class QuerySaasRoleReq {
*/ */
private List<String> roleTypesNotIn; private List<String> roleTypesNotIn;
/**
* 产品单位类型
* 1:总包 2:建设单位 3:监理单位 4:劳务分包 5:专业分包 6:OMS通用 7:企业通用 8:企业内班组 9:项目内班组
*/
private Integer productUnitType;
public QuerySaasRoleReq buildDefault() { public QuerySaasRoleReq buildDefault() {
if (this.workspaceId == null) { if (this.workspaceId == null) {
this.workspaceId = new ArrayList<>(); this.workspaceId = new ArrayList<>();

1
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
View File

@ -279,6 +279,7 @@ public class RoleServiceImpl extends ServiceImpl<SaasRoleMapper, SaasRole>
.eq(Objects.nonNull(req.getIsDisplay()), SaasRole::getIsDisplay, req.getIsDisplay()) .eq(Objects.nonNull(req.getIsDisplay()), SaasRole::getIsDisplay, req.getIsDisplay())
.eq(Objects.nonNull(req.getEnabled()), SaasRole::getEnabled, req.getEnabled()) .eq(Objects.nonNull(req.getEnabled()), SaasRole::getEnabled, req.getEnabled())
.notIn(CollectionUtils.isNotEmpty(req.getRoleTypesNotIn()), SaasRole::getRoleType, req.getRoleTypesNotIn()) .notIn(CollectionUtils.isNotEmpty(req.getRoleTypesNotIn()), SaasRole::getRoleType, req.getRoleTypesNotIn())
.eq(Objects.nonNull(req.getProductUnitType()), SaasRole::getProductUnitType, req.getProductUnitType())
.orderByDesc(BaseEntity::getId) .orderByDesc(BaseEntity::getId)
.list(); .list();
return getByIds(list.stream().map(BaseEntity::getId).collect(Collectors.toList()), req.getIsCommon(), req.getWorkspaceId(), req.getOuId(), req.getIncludePermissionGroup(), req.getIncludeSpecialRole()); return getByIds(list.stream().map(BaseEntity::getId).collect(Collectors.toList()), req.getIsCommon(), req.getWorkspaceId(), req.getOuId(), req.getIncludePermissionGroup(), req.getIncludeSpecialRole());