From e77c0102278c46bfbcc34cd7195dc8767306c147 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 十二月 2023 16:07:42 +0800
Subject: [PATCH] 融云修改
---
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 4166545..bf51c47 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
@@ -259,7 +259,7 @@
public AjaxResult groupUserAll(String groupId) {
ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupId);
QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("group_id",ardRongGroup);
+ queryWrapper.eq("group_id",ardRongGroup.getGroupId());
List<ArdRongGroupUser> list = ardRongGroupUserMapper.selectList(queryWrapper);
List<String> userList = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
@@ -267,7 +267,9 @@
}
QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
if(userList.size()>0){
- queryWrapper1.notIn("user_id",userList);
+ queryWrapper1.notIn("user_id",userList).eq("del_flag","0");
+ }else {
+ queryWrapper1.eq("del_flag","0");
}
List<SysUser> sysUsers = sysUserMapper.selectList(queryWrapper1);
return AjaxResult.success(sysUsers);
--
Gitblit v1.9.3