Skip to content

W
wecloud_im_server
Commit bcc9cbeb by Future
Options

bug fix

parent b0b4df5b
Showing with 7 additions and 7 deletions
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
...@@ -281,7 +281,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -281,7 +281,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
.eq(ImConversationMembers::getFkAppid, imApplication.getId()) .eq(ImConversationMembers::getFkAppid, imApplication.getId())
.eq(ImConversationMembers::getFkConversationId, imClientToConversation.getConversationId()) .eq(ImConversationMembers::getFkConversationId, imClientToConversation.getConversationId())
.notIn(ImConversationMembers::getId, imClientSender.getId()) .ne(ImConversationMembers::getFkClientId, imClientSender.getId())
); );
if (membersList.isEmpty()) { if (membersList.isEmpty()) {
log.info("membersList为空,toConversationId:" + imClientToConversation.getConversationId()); log.info("membersList为空,toConversationId:" + imClientToConversation.getConversationId());
...@@ -424,7 +424,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -424,7 +424,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
new QueryWrapper<ImConversationMembers>().lambda() new QueryWrapper<ImConversationMembers>().lambda()
.eq(ImConversationMembers::getFkAppid, imApplication.getId()) .eq(ImConversationMembers::getFkAppid, imApplication.getId())
.eq(ImConversationMembers::getFkConversationId, imClientToConversation.getConversationId()) .eq(ImConversationMembers::getFkConversationId, imClientToConversation.getConversationId())
.notIn(ImConversationMembers::getId, imClientSender.getId()) .ne(ImConversationMembers::getFkClientId, imClientSender.getId())
); );
if (membersList.isEmpty()) { if (membersList.isEmpty()) {
log.info("membersList为空,toConversationId:" + imClientToConversation.getConversationId()); log.info("membersList为空,toConversationId:" + imClientToConversation.getConversationId());
...@@ -528,7 +528,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -528,7 +528,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
new QueryWrapper<ImConversationMembers>().lambda() new QueryWrapper<ImConversationMembers>().lambda()
.eq(ImConversationMembers::getFkAppid, currentClient.getFkAppid()) .eq(ImConversationMembers::getFkAppid, currentClient.getFkAppid())
.eq(ImConversationMembers::getFkConversationId, param.getConversationId()) .eq(ImConversationMembers::getFkConversationId, param.getConversationId())
.notIn(ImConversationMembers::getId, currentClient.getId()) .ne(ImConversationMembers::getFkClientId, currentClient.getId())
); );
if (membersList.isEmpty()) { if (membersList.isEmpty()) {
throw new BusinessException("群聊成员列表为空"); throw new BusinessException("群聊成员列表为空");
...@@ -605,7 +605,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -605,7 +605,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
new QueryWrapper<ImConversationMembers>().lambda() new QueryWrapper<ImConversationMembers>().lambda()
.eq(ImConversationMembers::getFkConversationId, imClientToConversation.getConversationId()) .eq(ImConversationMembers::getFkConversationId, imClientToConversation.getConversationId())
.orderByAsc(ImConversationMembers::getCreateTime) .orderByAsc(ImConversationMembers::getCreateTime)
.notIn(ImConversationMembers::getFkClientId, currentClient.getId()) .ne(ImConversationMembers::getFkClientId, currentClient.getId())
); );
if (membersList.isEmpty()) { if (membersList.isEmpty()) {
...@@ -790,7 +790,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -790,7 +790,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
new QueryWrapper<ImConversationMembers>().lambda() new QueryWrapper<ImConversationMembers>().lambda()
.eq(ImConversationMembers::getFkAppid, currentClient.getFkAppid()) .eq(ImConversationMembers::getFkAppid, currentClient.getFkAppid())
.eq(ImConversationMembers::getFkConversationId, param.getConversationId()) .eq(ImConversationMembers::getFkConversationId, param.getConversationId())
.notIn(ImConversationMembers::getId, currentClient.getId()) .ne(ImConversationMembers::getFkClientId, currentClient.getId())
); );
if (membersList.isEmpty()) { if (membersList.isEmpty()) {
throw new BusinessException("群聊成员列表为空"); throw new BusinessException("群聊成员列表为空");
...@@ -926,7 +926,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -926,7 +926,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
List<ImConversationMembers> membersList = imConversationMembersService.list( List<ImConversationMembers> membersList = imConversationMembersService.list(
new QueryWrapper<ImConversationMembers>().lambda() new QueryWrapper<ImConversationMembers>().lambda()
.eq(ImConversationMembers::getFkConversationId, imConversationNameUpdate.getConversationId()) .eq(ImConversationMembers::getFkConversationId, imConversationNameUpdate.getConversationId())
.notIn(ImConversationMembers::getId, imClientSender.getId()) .ne(ImConversationMembers::getFkClientId, imClientSender.getId())
); );
imConversationById.setName(imConversationNameUpdate.getName()); imConversationById.setName(imConversationNameUpdate.getName());
...@@ -1009,7 +1009,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -1009,7 +1009,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
new QueryWrapper<ImConversationMembers>().lambda() new QueryWrapper<ImConversationMembers>().lambda()
.eq(ImConversationMembers::getFkAppid, imApplication.getId()) .eq(ImConversationMembers::getFkAppid, imApplication.getId())
.eq(ImConversationMembers::getFkConversationId, imConversationAttrUpdate.getConversationId()) .eq(ImConversationMembers::getFkConversationId, imConversationAttrUpdate.getConversationId())
.notIn(ImConversationMembers::getId, imClientSender.getId()) .ne(ImConversationMembers::getFkClientId, imClientSender.getId())
); );
String attributes = JsonUtils.encodeJson(imConversationAttrUpdate.getAttributes()); String attributes = JsonUtils.encodeJson(imConversationAttrUpdate.getAttributes());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment