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

feat:[REQ-3488] 暂时提交

Browse Source
This commit is contained in:
liuyang 2024-12-27 10:36:48 +08:00
parent 07e8782b20
commit f950393393
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orgmanax-common/src/main/java/cn/axzo/orgmanax/common/model/IBaseTree.java → orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/common/IBaseTree.java
View File

@ -1,4 +1,4 @@
package cn.axzo.orgmanax.common.model;
package cn.axzo.orgmanax.dto.common;
import java.util.List;

8
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/common/WorkspaceOuPair.java
View File

@ -11,6 +11,14 @@ import lombok.experimental.SuperBuilder;
@Data
@SuperBuilder
public class WorkspaceOuPair {
/**
* 项目ID
*/
private Long workspaceId;
/**
* 组织单位ID
*/
private Long ouId;
}

20
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/repository/NodeQueryRepository.java
View File

@ -5,22 +5,15 @@ import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
import cn.axzo.foundation.dao.support.wrapper.Operator;
import cn.axzo.foundation.page.PageReqV2;
import cn.axzo.foundation.page.PageResp;
import cn.axzo.orgmanax.dto.common.WorkspaceOuPair;
import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalNode;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.google.common.base.Preconditions;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.*;
import lombok.experimental.SuperBuilder;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.*;
/**
* @author tanjie@axzo.cn
@ -144,15 +137,10 @@ public interface NodeQueryRepository {
@Builder.Default
private Boolean isSelectTopNodeOnly = false;
/**
* 是否返回祖先节点 TODO：liuyang
*/
private Boolean needAncestorNode;
/**
* 根据workspace和ouId组合查询
*/
private Set<cn.axzo.orgmanax.dto.common.WorkspaceOuPair> workspaceOuPairs;
private Set<WorkspaceOuPair> workspaceOuPairs;
}

2
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java
View File

@ -84,7 +84,7 @@ public class NodeServiceImpl implements NodeService {
.page(req.getPage())
.pageSize(req.getPageSize())
.ids(req.getIds())
.parentIds(req.getIds())
.parentIds(req.getParentIds())
.ouIds(req.getOuIds())
.topNodeIds(req.getTopNodeIds())
.nodeName(req.getNodeName())