From eeb2ad8dd0146f1eed99a3124af17c74b4098570 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 27 十二月 2023 10:31:11 +0800
Subject: [PATCH] 融云
---
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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..b28a33b 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
@@ -164,9 +164,14 @@
Map<String, Object> groupMap = rongCloudClient.groupQuit(getRongCloudHead(), groupParam);
Integer code = (Integer) groupMap.get("code");
if (code.equals(200)) {
- ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupParam.getGroupId());
- ardRongGroup.setGroupName(groupParam.getGroupName());
- ardRongGroupMapper.updateById(ardRongGroup);
+ List<String> list = groupParam.getUserId();
+ for (int i = 0; i < list.size(); i++) {
+ String userId = list.get(i);
+ QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("group_id",groupParam.getGroupId())
+ .eq("user_id",userId);
+ ardRongGroupUserMapper.delete(queryWrapper);
+ }
}
groupMap.put("groupId", groupParam.getGroupId());
groupMap.put("groupName", groupParam.getGroupName());
@@ -259,7 +264,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 +272,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