wangli/im-center
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: (REQ-3057) 人群列表优化

Browse Source
This commit is contained in:
xudawei 2024-11-26 18:40:52 +08:00
parent 9a1476eff9
commit 0d7e58808c
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
im-center-server/src/main/java/cn/axzo/im/service/impl/ChatGroupServiceImpl.java
View File

@ -428,20 +428,6 @@ public class ChatGroupServiceImpl extends ServiceImpl<ChatGroupMapper, ChatGrou
@Override
public Set<ChatGroupCreateReq.CrowTypeEnum> fetchCrowTypeByWorkspacePersonId(Long workspaceId, Long personId) {
Set<ChatGroupCreateReq.CrowTypeEnum> jobResult = Sets.newHashSet();
List<OrganizationalNodeUserVO> nodeUserVOList = organizationalNodeUserApiGateway.searchNodeUser(null, workspaceId, null, personId, true);
if (CollectionUtils.isNotEmpty(nodeUserVOList)) {
for(OrganizationalNodeUserVO nodeUserVO : nodeUserVOList) {
if (JobCodeUtils.isProjectManaGpWorkerLeader(nodeUserVO.getOrganizationalJobCode())) {
continue;
}
jobResult = jobCodeProperties.isAdmin(nodeUserVO.getOrganizationalJobCode()) ? ChatGroupCreateReq.CrowTypeEnum.workspaceOu() : JobCodeUtils.isProjectTeamLeader(nodeUserVO.getOrganizationalJobCode()) ? ChatGroupCreateReq.CrowTypeEnum.team() : Sets.newHashSet();
if (CollectionUtils.isNotEmpty(jobResult) && jobResult.contains(ChatGroupCreateReq.CrowTypeEnum.TEAM)) {
return jobResult;
}
}
}
List<SaasRoleUserV2DTO> saasRoleUserV2DTOS = tyrApiGateway.fetchSaasRoleByWorkspacePersonIdNeedRole(workspaceId, personId, true);
Set<ChatGroupCreateReq.CrowTypeEnum> roleResult = Sets.newHashSet();
if (CollectionUtils.isNotEmpty(saasRoleUserV2DTOS)) {
@ -460,6 +446,18 @@ public class ChatGroupServiceImpl extends ServiceImpl<ChatGroupMapper, ChatGrou
}
}
Set<ChatGroupCreateReq.CrowTypeEnum> jobResult = Sets.newHashSet();
List<OrganizationalNodeUserVO> nodeUserVOList = organizationalNodeUserApiGateway.searchNodeUser(null, workspaceId, null, personId, true);
if (CollectionUtils.isNotEmpty(nodeUserVOList)) {
for(OrganizationalNodeUserVO nodeUserVO : nodeUserVOList) {
if (JobCodeUtils.isProjectManaGpWorkerLeader(nodeUserVO.getOrganizationalJobCode())) {
continue;
}
jobResult = jobCodeProperties.isAdmin(nodeUserVO.getOrganizationalJobCode()) ? ChatGroupCreateReq.CrowTypeEnum.workspaceOu() : JobCodeUtils.isProjectTeamLeader(nodeUserVO.getOrganizationalJobCode()) ? ChatGroupCreateReq.CrowTypeEnum.team() : Sets.newHashSet();
// jobResult = JobCodeUtils.isAdmin(nodeUserVO.getOrganizationalJobCode()) ? ChatGroupCreateReq.CrowTypeEnum.workspaceOu() : JobCodeUtils.isProjectTeamLeader(nodeUserVO.getOrganizationalJobCode()) ? ChatGroupCreateReq.CrowTypeEnum.team() : Sets.newHashSet();
}
}
return ChatGroupCreateReq.CrowTypeEnum.mergeCrowType(roleResult, jobResult);
}