From 2f254e6cb24cab39e452a166f2abefe55e0f6895 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 十二月 2023 11:31:03 +0800
Subject: [PATCH] 融云
---
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java | 6 ++++--
ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java b/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
index 74371c3..b4c74c5 100644
--- a/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
+++ b/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
@@ -112,7 +112,7 @@
}
@GetMapping("/groupUserAll")
- @ApiOperation("缇ょ粍绠＄悊-鏌ヨ缇ょ粍璇︽儏")
+ @ApiOperation("缇ょ粍绠＄悊-鏌ヨ浜哄憳閫夋嫨")
public AjaxResult groupUserAll(String groupId)
{
return rongCloudService.groupUserAll(groupId);
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..5c1022e 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
@@ -257,14 +257,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