Compare commits

...

2 Commits

View File

@@ -423,11 +423,23 @@ public class TaskServiceImpl implements ITaskService {
if (CollectionUtils.isEmpty(attentionMemberList)) {
return new ArrayList<>();
}
List<String> myTaskIdList = attentionMemberList.stream()
Set<String> myTaskIdSetFromAttention = attentionMemberList.stream()
.filter(member -> userId.equals(member.getUserId()))
.map(SpdmTaskAttentionMemberVo::getTaskId)
.collect(Collectors.toList());
return taskList.stream().filter(task -> myTaskIdList.contains(task.getUuid())).collect(Collectors.toList());
.collect(Collectors.toSet());
if (CollectionUtils.isNotEmpty(myTaskIdSetFromAttention)) {
taskMemberVoList.stream()
.filter(member -> userId.equals(member.getUserId()) && MemberTypeEnum.ATTENTION.getCode().equals(member.getType()))
.map(SpdmTaskMemberVo::getTaskId)
.forEach(myTaskIdSetFromAttention::add);
}else {
myTaskIdSetFromAttention = taskMemberVoList.stream()
.filter(member -> userId.equals(member.getUserId()) && MemberTypeEnum.ATTENTION.getCode().equals(member.getType()))
.map(SpdmTaskMemberVo::getTaskId)
.collect(Collectors.toSet());
}
Set<String> finalMyTaskIdSetFromAttention = myTaskIdSetFromAttention;
return taskList.stream().filter(task -> finalMyTaskIdSetFromAttention.contains(task.getUuid())).collect(Collectors.toList());
}
return new ArrayList<>();