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

Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'

Browse Source 
feat(REQ-3488): node查询，添加platTeamIds

See merge request universal/infrastructure/backend/orgmanax!118
This commit is contained in:
张弘昊 2025-01-06 07:00:18 +00:00
commit 6c5a407930
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java
View File

@ -51,18 +51,21 @@ public class ListNodeReq extends PageReqV2 {
* 指定部门类型 * 指定部门类型
*/ */
@Builder.Default @Builder.Default
private Set<Integer> includeOrgNodeTypes = Collections.emptySet();; private Set<Integer> includeOrgNodeTypes = Collections.emptySet();
;
/** /**
* 排除部门类型 * 排除部门类型
*/ */
@Builder.Default @Builder.Default
private Set<Integer> excludeOrgNodeTypes = Collections.emptySet();; private Set<Integer> excludeOrgNodeTypes = Collections.emptySet();
;
/** /**
* 顶级节点ID集合 * 顶级节点ID集合
*/ */
@Builder.Default @Builder.Default
private Set<Long> topNodeIds = Collections.emptySet();; private Set<Long> topNodeIds = Collections.emptySet();
;
/** /**
* 是否包含祖先节点 * 是否包含祖先节点
@ -116,23 +119,32 @@ public class ListNodeReq extends PageReqV2 {
* 根据workspace和ouId组合查询 * 根据workspace和ouId组合查询
*/ */
@Builder.Default @Builder.Default
private Set<WorkspaceOuPair> workspaceOuPairs = Collections.emptySet();; private Set<WorkspaceOuPair> workspaceOuPairs = Collections.emptySet();
;
/** /**
* 项目id集合 * 项目id集合
*/ */
@Builder.Default @Builder.Default
private Set<Long> workspaceIds = Collections.emptySet();; private Set<Long> workspaceIds = Collections.emptySet();
/** /**
* 岗位编码 * 岗位编码
*/ */
@Builder.Default @Builder.Default
private Set<String> jobCodes = Collections.emptySet();; private Set<String> jobCodes = Collections.emptySet();
;
/** /**
* 当前用户personId * 当前用户personId
*/ */
private Long personId; private Long personId;
/**
* 平台班组id
* todo 未实现
*/
@Builder.Default
private Set<Long> platTeamIds = Collections.emptySet();
} }

1
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java
View File

@ -38,6 +38,7 @@ public class ProjectTeamServiceImpl implements ProjectTeamService {
.includeOrgNodeTypes(includeOrgNodeTypes) .includeOrgNodeTypes(includeOrgNodeTypes)
.ids(req.getOrganizationalNodeIdList()) .ids(req.getOrganizationalNodeIdList())
.ouIds(req.getOuIds()) .ouIds(req.getOuIds())
.platTeamIds(req.getPlatTeamIds())
.workspaceIds(req.getWorkspaceIds()) .workspaceIds(req.getWorkspaceIds())
.build(); .build();
List<OrgNodeDTO> orgNodeDTOS = nodeService.list(nodeReq); List<OrgNodeDTO> orgNodeDTOS = nodeService.list(nodeReq);