DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页大型更新，修正通信ui

Browse Source
This commit is contained in:
hdka
2024-12-30 16:44:53 +08:00
parent a23c049c7d
commit 28e379aa2a
26 changed files with 929 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SocketContactServiceImpl.java
View File

@@ -56,9 +56,7 @@ public class SocketContactServiceImpl implements ISocketContactService {
SocketContactVo socketContactVo = baseMapper.selectVoById(id);
LambdaQueryWrapper<SocketMessage> socketMessageLambdaQueryWrapper = new LambdaQueryWrapper<>();
socketMessageLambdaQueryWrapper.eq(SocketMessage::getRoomId, socketContactVo.getRoomId())
.and(item ->
item.eq(SocketMessage::getContactId,id)
);
.eq(SocketMessage::getContactId, id);
Long userId = LoginHelper.getUserId();
socketContactVo.setUser(sysUserMapper.selectUserById(Objects.equals(socketContactVo.getContactUserId(), userId) ?socketContactVo.getUserId():socketContactVo.getContactUserId()));
List<SocketMessageVo> socketMessageVos = socketMessageMapper.selectVoList(socketMessageLambdaQueryWrapper);
@@ -68,6 +66,7 @@ public class SocketContactServiceImpl implements ISocketContactService {
item.setUser(sysUser);
}).collect(Collectors.toList());
socketContactVo.setMessages(socketMessageVos);
return socketContactVo;
}