From 1d2ec60e68faf24bcc2e77fe9c0af7d7bf2deb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Wed, 17 Sep 2025 19:12:55 +0800 Subject: [PATCH] =?UTF-8?q?09-17-=E4=BF=AE=E6=94=B9=E9=80=9A=E8=AE=AF?= =?UTF-8?q?=E5=BD=95=E8=8E=B7=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/Impl/ChatFriendshipServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 f1fe86c9..3f0e53d6 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 @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -17,6 +18,8 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.project.domain.BusUserProjectRelevancy; +import org.dromara.project.service.impl.BusUserProjectRelevancyServiceImpl; import org.dromara.system.domain.SysDept; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.SysUserFile; @@ -44,11 +47,15 @@ public class ChatFriendshipServiceImpl extends ServiceImpl> getAppUserList(SysUserBo user, PageQuery pageQuery){ - SysUserVo sysUserVo = sysUserMapper.selectVoById(LoginHelper.getLoginUser().getUserId()); - if (sysUserVo.getProjectIds() == null || sysUserVo.getProjectIds().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();