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

Merge branch 'feature/REQ-3488' into 'master'

Browse Source 
Feature/req 3488

See merge request universal/infrastructure/backend/orgmanax!203
This commit is contained in:
周敏 2025-02-19 07:54:57 +00:00
commit efe60a26d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/dto/NodeProfile.java
View File

@ -184,7 +184,7 @@ public class NodeProfile {
/**
* 是否独立小组，true 独立，false 非独立
*/
private Boolean independentGroup;
private Boolean independentGroup = false;
}

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

@ -105,15 +105,15 @@ public class CooperateShipFoundationServiceImpl implements CooperateShipFoundati
return;
}
Map<Long, OrgJobQueryRepository.JobResp> jobMap = CollStreamUtil.toMap(jobList, OrgJob::getId, Function.identity());
List<Long> jobNodeIds = nodeUsers.stream().filter(t -> {
List<Long> excludeJobNodeIds = nodeUsers.stream().filter(t -> {
OrgJobQueryRepository.JobResp job = jobMap.get(t.getOrganizationalJobId());
// 岗位不存在，不做排除
if (job == null) {
return true;
return false;
}
return excludeJobCodes.contains(job.getCode());
}).map(OrganizationalNodeUser::getTopNodeId).collect(Collectors.toList());
nodeIds.removeIf(t -> !jobNodeIds.contains(t));
nodeIds.removeIf(excludeJobNodeIds::contains);
}
// 删除原协同关系节点