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

Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-zhh

Browse Source
This commit is contained in:
zhanghonghao 2024-12-19 14:43:14 +08:00
commit 13056f0067
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,17 +82,20 @@ public class ListOrgCooperateShipReq {
* 需要过滤的personId * 需要过滤的personId
* personId * personId
*/ */
private Long filterPersonId; @CriteriaField(ignore = true)
private Long filterPersonId ;
/** /**
* 当personId有值时，为必填项 * 当personId有值时，为必填项
* 1只过滤当前节点数据 2过滤当前节点及以下数据 * 1只过滤当前节点数据 2过滤当前节点及以下数据
*/ */
@CriteriaField(ignore = true)
private Integer filterPersonType; private Integer filterPersonType;
/** /**
* 是否过滤工人 * 是否过滤工人
*/ */
@CriteriaField(ignore = true)
@Builder.Default @Builder.Default
private Boolean isFilterWorker = false; private Boolean isFilterWorker = false;
@ -100,18 +103,21 @@ public class ListOrgCooperateShipReq {
/** /**
* 人员过滤是否包含已退场 * 人员过滤是否包含已退场
*/ */
@CriteriaField(ignore = true)
@Builder.Default @Builder.Default
private Boolean includeExitPerson = false; private Boolean includeExitPerson = false;
/** /**
* 是否查询祖先节点 * 是否查询祖先节点
*/ */
@CriteriaField(ignore = true)
@Builder.Default @Builder.Default
private Boolean isSelectAncestors = false; private Boolean isSelectAncestors = false;
/** /**
* 是否查询子孙节点 * 是否查询子孙节点
*/ */
@CriteriaField(ignore = true)
@Builder.Default @Builder.Default
private Boolean isSelectDescendant = false; private Boolean isSelectDescendant = false;
@ -119,6 +125,7 @@ public class ListOrgCooperateShipReq {
* 条件：当需要查询上下级数据时启用 * 条件：当需要查询上下级数据时启用
* 是否只查一级 * 是否只查一级
*/ */
@CriteriaField(ignore = true)
@Builder.Default @Builder.Default
private Boolean isSelectLevelOne = false; private Boolean isSelectLevelOne = false;

2
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/MybatisPlusConfig.java
View File

@ -38,7 +38,7 @@ public class MybatisPlusConfig {
* 本地启动默认打印sql日志 * 本地启动默认打印sql日志
*/ */
@Bean @Bean
@LocalCondition.Conditional // @LocalCondition.Conditional
public ConfigurationCustomizer localConfigurationCustomizer() { public ConfigurationCustomizer localConfigurationCustomizer() {
return configuration -> configuration.setLogImpl(StdOutImpl.class); return configuration -> configuration.setLogImpl(StdOutImpl.class);
} }

2
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/repository/impl/NodeQueryRepositoryImpl.java
View File

@ -51,7 +51,7 @@ public class NodeQueryRepositoryImpl implements NodeQueryRepository {
} }
private void assembleParentNode(ListNodeReq req, List<NodeResp> records) { private void assembleParentNode(ListNodeReq req, List<NodeResp> records) {
if (!BooleanUtil.isTrue(req.getNeedParent())) { if (!BooleanUtil.isTrue(req.getIsSelectAncestors())) {
return; return;
} }
Map<Long, NodeResp> nodesById = records.stream().collect(Collectors.toMap(NodeResp::getId, Function.identity())); Map<Long, NodeResp> nodesById = records.stream().collect(Collectors.toMap(NodeResp::getId, Function.identity()));

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

@ -126,6 +126,7 @@ public class CooperateShipServiceImpl implements CooperateShipService {
public List<OrgCooperateShipDTO> list(ListOrgCooperateShipReq req) { public List<OrgCooperateShipDTO> list(ListOrgCooperateShipReq req) {
boolean isFilterCurrentNodeByPerson = ObjectUtil.isNotNull(req.getFilterPersonId()) && Objects.equals(req.getFilterPersonType(), 1); boolean isFilterCurrentNodeByPerson = ObjectUtil.isNotNull(req.getFilterPersonId()) && Objects.equals(req.getFilterPersonType(), 1);
boolean isFilterCurrentAndBelowByPerson = ObjectUtil.isNotNull(req.getFilterPersonId()) && Objects.equals(req.getFilterPersonType(), 2);
// 根据入参查询数据 // 根据入参查询数据
List<SaasCooperateShip> list = cooperateShipQueryRepository.list(req); List<SaasCooperateShip> list = cooperateShipQueryRepository.list(req);
@ -133,7 +134,7 @@ public class CooperateShipServiceImpl implements CooperateShipService {
return Collections.emptyList(); return Collections.emptyList();
} }
// 是否根据person过滤当前节点 // 根据person过滤当前节点
if (isFilterCurrentNodeByPerson) { if (isFilterCurrentNodeByPerson) {
cooperateShipFoundationService.filterByPerson(req.getFilterPersonId(), list); cooperateShipFoundationService.filterByPerson(req.getFilterPersonId(), list);
} }
@ -144,6 +145,12 @@ public class CooperateShipServiceImpl implements CooperateShipService {
List<SaasCooperateShip> ancestorShipNodes = cooperateShipQueryRepository.list(ListOrgCooperateShipReq.builder().ids(ancestorIds).build()); List<SaasCooperateShip> ancestorShipNodes = cooperateShipQueryRepository.list(ListOrgCooperateShipReq.builder().ids(ancestorIds).build());
list.addAll(ancestorShipNodes); list.addAll(ancestorShipNodes);
} }
// 根据person过滤当前节点及以下节点
if (isFilterCurrentAndBelowByPerson) {
cooperateShipFoundationService.filterByPerson(req.getFilterPersonId(), list);
}
return BeanUtil.copyToList(list, OrgCooperateShipDTO.class); return BeanUtil.copyToList(list, OrgCooperateShipDTO.class);
} }
} }