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-25 14:18:13 +08:00
parent fd93f73c58
commit 7a41b82e61
5 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/cooperateship/req/ListOrgCooperateShipReq.java
View File

@ -82,18 +82,6 @@ public class ListOrgCooperateShipReq {
*/
private Integer filterPersonType;
/**
* 是否过滤工人
*/
@Builder.Default
private Boolean isFilterWorker = false;
/**
* 人员过滤是否包含已退场
*/
@Builder.Default
private Boolean includeExitPerson = false;
/**
* 是否包含祖先节点
*/

7
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/cooperateship/repository/CooperateShipQueryRepository.java
View File

@ -129,13 +129,6 @@ public interface CooperateShipQueryRepository {
@Builder.Default
private Collection<Long> parentIds = Collections.emptySet();
/**
* 是否包含删除数据
*/
@CriteriaField(ignore = true)
@Builder.Default
private Boolean includeDelete = false;
/**
* 项目单位关系聚合查询
*/

3
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/cooperateship/repository/impl/CooperateShipQueryRepositoryImpl.java
View File

@ -24,7 +24,6 @@ import java.util.stream.Collectors;
public class CooperateShipQueryRepositoryImpl implements CooperateShipQueryRepository {
private final SaasCooperateShipDao cooperateShipDao;
private final NodeUserQueryRepository nodeUserQueryRepository;
@Override
public List<SaasCooperateShip> list(CooperateShipQueryRepository.ListReq req) {
@ -56,7 +55,7 @@ public class CooperateShipQueryRepositoryImpl implements CooperateShipQueryRepos
return Collections.emptyList();
}
wrapper.eq(!req.getIncludeDelete(), "is_delete", 0);
wrapper.eq("is_delete", 0);
return cooperateShipDao.list(wrapper)
.stream().map(e -> BeanUtil.toBean(e, SaasCooperateShip.class)).collect(Collectors.toList());

2
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java
View File

@ -20,7 +20,7 @@ import org.springframework.stereotype.Service;
@Service
public class CooperateShipFoundationServiceImpl implements CooperateShipFoundationService {
private NodeUserQueryRepository nodeUserQueryRepository;
private final NodeUserQueryRepository nodeUserQueryRepository;
@Override
public void filterByPerson(Long filterPersonId, List<SaasCooperateShip> list) {

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

@ -127,7 +127,6 @@ public class NodeServiceImpl implements NodeService {
List<Long> topNodeIds = CollUtil.map(cooperateShipQueryRepository.list(CooperateShipQueryRepository.ListReq.builder()
.workspaceIds(req.getWorkspaceIds())
.workspaceOuPairs(req.getWorkspaceOuPairs())
.includeDelete(false)
.build()), SaasCooperateShip::getOrganizationalNodeId, true);
if (CollUtil.isEmpty(topNodeIds)) {
return emptyPageResp;