From 26913afc35d73a33f8430329dc555f89ba5e3c76 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 十二月 2023 13:47:43 +0800
Subject: [PATCH] 融云

---
 ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java b/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
index d892d16..6349054 100644
--- a/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
@@ -238,7 +238,9 @@
     @Override
     public AjaxResult groupInfo(String groupId) {
         Map<String,Object> map = new HashMap<>();
-        ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupId);
+        QueryWrapper<ArdRongGroup> ardRongGroupQueryWrapper = new QueryWrapper<>();
+        ardRongGroupQueryWrapper.eq("group_id",groupId);
+        ArdRongGroup ardRongGroup = ardRongGroupMapper.selectOne(ardRongGroupQueryWrapper);
         map.put("group",ardRongGroup);
         QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("group_id",groupId);
@@ -257,14 +259,16 @@
     public AjaxResult groupUserAll(String groupId) {
         ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupId);
         QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("group_id",groupId);
+        queryWrapper.eq("group_id",ardRongGroup);
         List<ArdRongGroupUser> list = ardRongGroupUserMapper.selectList(queryWrapper);
         List<String> userList = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
             userList.add(list.get(i).getUserId());
         }
         QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.notIn("user_id",userList);
+        if(userList.size()>0){
+            queryWrapper1.notIn("user_id",userList);
+        }
         List<SysUser> sysUsers = sysUserMapper.selectList(queryWrapper1);
         return AjaxResult.success(sysUsers);
     }

--
Gitblit v1.9.3