diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java index dd6344df..851d85df 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java @@ -34,6 +34,7 @@ import org.dromara.websocket.mapper.ChatFriendshipMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -51,14 +52,15 @@ public class ChatFriendshipServiceImpl extends ServiceImpl> getAppUserList(SysUserBo user, PageQuery pageQuery){ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(BusUserProjectRelevancy::getUserId, LoginHelper.getUserId()); - List one = busUserProjectRelevancyService.list(lambdaQueryWrapper); - if (one == null || one.isEmpty()){ - return R.fail("该账号暂无项目组,请尽快联系管理员进行分配"); - } +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.eq(BusUserProjectRelevancy::getUserId, LoginHelper.getUserId()); +// List one = busUserProjectRelevancyService.list(lambdaQueryWrapper); +// if (one == null || one.isEmpty()){ +// return R.fail("该账号暂无项目组,请尽快联系管理员进行分配"); +// } Page page = sysUserMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); List userVoList = page.getRecords(); + List temps = new ArrayList<>(); List userIdList = userVoList.stream().map(SysUserVo::getUserId).toList(); if (CollUtil.isNotEmpty(userIdList)) { List userFileList = userFileService.lambdaQuery() @@ -69,9 +71,7 @@ public class ChatFriendshipServiceImpl extends ServiceImpl fileList = userFileMap.get(userId); String fileIdStr = fileList.stream() @@ -79,9 +79,11 @@ public class ChatFriendshipServiceImpl extends ServiceImpl