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

feat:[REQ-3282] 暂时提交

Browse Source
This commit is contained in:
liuyang 2024-12-20 17:12:16 +08:00
parent e816cc703f
commit ea27e70c08
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
orgmanax-api/src/main/java/cn/axzo/orgmanax/api/cooperateship/req/ListOrgCooperateShipReq.java
View File

@ -34,7 +34,7 @@ public class ListOrgCooperateShipReq {
*/
@CriteriaField(field = "workspaceType", operator = Operator.IN)
@Builder.Default
private Set<Integer> workspaceType = Collections.emptySet();
private Set<Integer> workspaceTypes = Collections.emptySet();
/**
* 单位id集合(如果是班组则插入队伍id)
@ -78,6 +78,10 @@ public class ListOrgCooperateShipReq {
@Builder.Default
private Set<Integer> statuses = Collections.emptySet();
@CriteriaField(field = "path", operator = Operator.SW)
@Builder.Default
private Set<String> pathRight = Collections.emptySet();
/**
* 需要过滤的personId
* personId
@ -86,7 +90,7 @@ public class ListOrgCooperateShipReq {
private Long filterPersonId ;
/**
* 当personId有值时，为必填项
* 当personId有值时，为必填项
* 1只过滤当前节点数据 2过滤当前节点及以下数据
*/
@CriteriaField(ignore = true)
@ -119,7 +123,7 @@ public class ListOrgCooperateShipReq {
*/
@CriteriaField(ignore = true)
@Builder.Default
private Boolean isSelectDescendant = false;
private Boolean isSelectDescendants = false;
/**
* 条件：当需要查询上下级数据时启用

9
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/service/impl/CooperateShipServiceImpl.java
View File

@ -149,6 +149,15 @@ public class CooperateShipServiceImpl implements CooperateShipService {
list.addAll(ancestorShipNodes);
}
// 是否查询子孙
if (BooleanUtil.isTrue(req.getIsSelectDescendants())) {
List<SaasCooperateShip> descendantShipNodes = cooperateShipQueryRepository.list(ListOrgCooperateShipReq.builder().build());
// list.addAll(descendantShipNodes);
}
// 根据person过滤当前节点及以下节点
if (isFilterCurrentAndBelowByPerson) {
cooperateShipFoundationService.filterByPerson(req.getFilterPersonId(), list);