diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java index 06facd4..7af7baf 100644 --- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java @@ -51,18 +51,21 @@ public class ListNodeReq extends PageReqV2 { * 指定部门类型 */ @Builder.Default - private Set includeOrgNodeTypes = Collections.emptySet();; + private Set includeOrgNodeTypes = Collections.emptySet(); + ; /** * 排除部门类型 */ @Builder.Default - private Set excludeOrgNodeTypes = Collections.emptySet();; + private Set excludeOrgNodeTypes = Collections.emptySet(); + ; /** * 顶级节点ID集合 */ @Builder.Default - private Set topNodeIds = Collections.emptySet();; + private Set topNodeIds = Collections.emptySet(); + ; /** * 是否包含祖先节点 @@ -116,23 +119,32 @@ public class ListNodeReq extends PageReqV2 { * 根据workspace和ouId组合查询 */ @Builder.Default - private Set workspaceOuPairs = Collections.emptySet();; + private Set workspaceOuPairs = Collections.emptySet(); + ; /** * 项目id集合 */ @Builder.Default - private Set workspaceIds = Collections.emptySet();; + private Set workspaceIds = Collections.emptySet(); /** * 岗位编码 */ @Builder.Default - private Set jobCodes = Collections.emptySet();; + private Set jobCodes = Collections.emptySet(); + ; /** * 当前用户personId */ private Long personId; -} + /** + * 平台班组id + * todo 未实现 + */ + @Builder.Default + private Set platTeamIds = Collections.emptySet(); + +} \ No newline at end of file diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java index bbb464f..08337ff 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java @@ -38,6 +38,7 @@ public class ProjectTeamServiceImpl implements ProjectTeamService { .includeOrgNodeTypes(includeOrgNodeTypes) .ids(req.getOrganizationalNodeIdList()) .ouIds(req.getOuIds()) + .platTeamIds(req.getPlatTeamIds()) .workspaceIds(req.getWorkspaceIds()) .build(); List orgNodeDTOS = nodeService.list(nodeReq);