joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

【用户给自己发送消息时，发错会话组问题】

Browse Source
This commit is contained in:
weizhihong 2023-05-24 10:07:07 +08:00
parent a780b385bd
commit e016aab767
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/club/joylink/rtss/simulation/cbtc/conversation/ConversationGroupHandlerService.java
View File

@ -351,7 +351,10 @@ public class ConversationGroupHandlerService {
private ConversationGroup getPrivateConversation(Simulation simulation, SimulationMember member, String memberId) {
SimulationMember communicator = simulation.getSimulationMemberById(memberId);
ConversationGroup conversationGroup = simulation.getSimulationConversationGroupMap().values()
.stream().filter(group -> group.isPrivate() && group.contains(communicator)).findFirst().orElse(null);
.stream().filter(group -> {
int memberNumber = Objects.equals(member.getId(), memberId) ? 1 : 2;
return group.getMemberList().size() == memberNumber && group.isPrivate() && group.contains(communicator);
}).findFirst().orElse(null);
if (conversationGroup == null) {
Long groupId = simulation.getMaxConversationGroupId();
conversationGroup = new ConversationGroup(groupId, null, null, simulation.getCorrectSystemTime(),