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 13:48:38 +08:00
parent fad1d08bb6
commit e816cc703f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,12 +34,9 @@ public class CooperateShipQueryRepositoryImpl implements CooperateShipQueryRepos
log.warn("CooperateShipResp empty of where query. return empty list. req = {}", req);
return Collections.emptyList();
}
List<SaasCooperateShip> results = cooperateShipDao.list(wrapper)
return cooperateShipDao.list(wrapper)
.stream().map(e -> BeanUtil.toBean(e, SaasCooperateShip.class)).collect(Collectors.toList());
results = filterByPersonIds(results, req);
return results;
}
private List<SaasCooperateShip> filterByPersonIds(List<SaasCooperateShip> results, ListOrgCooperateShipReq req) {

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

@ -122,13 +122,16 @@ public class CooperateShipServiceImpl implements CooperateShipService {
return cooperateShipQueryRepository.one(CooperateShipQueryRepository.OneReq.builder().id(saved.getId()).build());
}
@Override
public List<OrgCooperateShipDTO> list(ListOrgCooperateShipReq req) {
// 是否查询当前节点的人员
boolean isFilterCurrentNodeByPerson = ObjectUtil.isNotNull(req.getFilterPersonId()) && Objects.equals(req.getFilterPersonType(), 1);
boolean isFilterCurrentAndBelowByPerson = ObjectUtil.isNotNull(req.getFilterPersonId()) && Objects.equals(req.getFilterPersonType(), 2);
// 是否查询当前节点及以下节点的人员
boolean isFilterCurrentAndBelowByPerson = !isFilterCurrentNodeByPerson && ObjectUtil.isNotNull(req.getFilterPersonId()) && Objects.equals(req.getFilterPersonType(), 2);
// 根据入参查询数据
// 1. 根据入参查询数据
List<SaasCooperateShip> list = cooperateShipQueryRepository.list(req);
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
@ -151,6 +154,7 @@ public class CooperateShipServiceImpl implements CooperateShipService {
cooperateShipFoundationService.filterByPerson(req.getFilterPersonId(), list);
}
return BeanUtil.copyToList(list, OrgCooperateShipDTO.class);
}
}