lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

09-26-修复联系人列表

Browse Source
This commit is contained in:
青云
2025-09-26 11:37:24 +08:00
parent f87c67349d
commit 944d36e5e7
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java
View File

@ -34,6 +34,7 @@ import org.dromara.websocket.mapper.ChatFriendshipMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -51,14 +52,15 @@ public class ChatFriendshipServiceImpl extends ServiceImpl<ChatFriendshipMapper,
private BusUserProjectRelevancyServiceImpl busUserProjectRelevancyService; private BusUserProjectRelevancyServiceImpl busUserProjectRelevancyService;
public R<TableDataInfo<SysUserVo>> getAppUserList(SysUserBo user, PageQuery pageQuery){ public R<TableDataInfo<SysUserVo>> getAppUserList(SysUserBo user, PageQuery pageQuery){
LambdaQueryWrapper<BusUserProjectRelevancy> lambdaQueryWrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<BusUserProjectRelevancy> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(BusUserProjectRelevancy::getUserId, LoginHelper.getUserId()); // lambdaQueryWrapper.eq(BusUserProjectRelevancy::getUserId, LoginHelper.getUserId());
List<BusUserProjectRelevancy> one = busUserProjectRelevancyService.list(lambdaQueryWrapper); // List<BusUserProjectRelevancy> one = busUserProjectRelevancyService.list(lambdaQueryWrapper);
if (one == null || one.isEmpty()){ // if (one == null || one.isEmpty()){
return R.fail("该账号暂无项目组，请尽快联系管理员进行分配"); // return R.fail("该账号暂无项目组，请尽快联系管理员进行分配");
} // }
Page<SysUserVo> page = sysUserMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); Page<SysUserVo> page = sysUserMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
List<SysUserVo> userVoList = page.getRecords(); List<SysUserVo> userVoList = page.getRecords();
List<SysUserVo> temps = new ArrayList<>();
List<Long> userIdList = userVoList.stream().map(SysUserVo::getUserId).toList(); List<Long> userIdList = userVoList.stream().map(SysUserVo::getUserId).toList();
if (CollUtil.isNotEmpty(userIdList)) { if (CollUtil.isNotEmpty(userIdList)) {
List<SysUserFile> userFileList = userFileService.lambdaQuery() List<SysUserFile> userFileList = userFileService.lambdaQuery()
@ -69,9 +71,7 @@ public class ChatFriendshipServiceImpl extends ServiceImpl<ChatFriendshipMapper,
Long userId = userVo.getUserId(); Long userId = userVo.getUserId();
if (userId.equals(LoginHelper.getUserId())){ if (!userId.equals(LoginHelper.getUserId())){
userVoList.remove(userVo);
}else {
if (userFileMap.containsKey(userId)) { if (userFileMap.containsKey(userId)) {
List<SysUserFile> fileList = userFileMap.get(userId); List<SysUserFile> fileList = userFileMap.get(userId);
String fileIdStr = fileList.stream() String fileIdStr = fileList.stream()
@ -79,9 +79,11 @@ public class ChatFriendshipServiceImpl extends ServiceImpl<ChatFriendshipMapper,
.collect(Collectors.joining(",")); .collect(Collectors.joining(","));
userVo.setFilePath(fileIdStr); userVo.setFilePath(fileIdStr);
} }
temps.add(userVo);
} }
}); });
page.setRecords(userVoList); page.setRecords(temps);
} }
return R.ok(TableDataInfo.build(page)); return R.ok(TableDataInfo.build(page));
} }