修复拉黑还能发消息bug;

修复拉黑列表接口

common/src/main/java/com/wecloud/im/mapper/ImClientBlacklistMapper.java

 package com.wecloud.im.mapper;
 package com.wecloud.im.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wecloud.im.entity.ImClientBlacklist;
 import com.wecloud.im.entity.ImClientBlacklist;
 import com.wecloud.im.param.ImClientBlacklistQueryVo;
 import com.wecloud.im.param.ImClientBlacklistQueryVo;
-import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
@@ -25,7 +25,7 @@ public interface ImClientBlacklistMapper extends BaseMapper<ImClientBlacklist> {
      * @param clientId
      * @param clientId
      * @return
      * @return
      */
      */
-    Paging<ImClientBlacklistQueryVo> getImClientBlacklistPageList(@Param("page") Page page, @Param("clientId") Long clientId);
+    IPage<ImClientBlacklistQueryVo> getImClientBlacklistPageList(@Param("page") Page page, @Param("clientId") Long clientId);
 
 
     /**
     /**
      * 根据ID获取查询对象
      * 根据ID获取查询对象

common/src/main/java/com/wecloud/im/service/impl/ImClientBlacklistServiceImpl.java

 package com.wecloud.im.service.impl;
 package com.wecloud.im.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wecloud.im.entity.ImClient;
 import com.wecloud.im.entity.ImClient;
@@ -123,9 +124,11 @@ public class ImClientBlacklistServiceImpl extends BaseServiceImpl<ImClientBlackl
 
 
         ImClient client = imClientService.getClient();
         ImClient client = imClientService.getClient();
 
 
-        Paging<ImClientBlacklistQueryVo> imClientBlacklistPageList = imClientBlacklistMapper.getImClientBlacklistPageList(page, client.getId());
+        IPage<ImClientBlacklistQueryVo> imClientBlacklistPageList = imClientBlacklistMapper.getImClientBlacklistPageList(page, client.getId());
 
 
-        return ApiResult.ok(imClientBlacklistPageList);
+        Paging<ImClientBlacklistQueryVo> imClientBlacklistQueryVoPaging = new Paging<>(imClientBlacklistPageList);
+
+        return ApiResult.ok(imClientBlacklistQueryVoPaging);
     }
     }
 
 
 }
 }

common/src/main/java/com/wecloud/im/tillo/app_ws/strategy/concrete/ImConcreteReceiveStrategy.java

@@ -133,7 +133,8 @@ public class ImConcreteReceiveStrategy extends AbstractReceiveStrategy {
         // 判断为单聊
         // 判断为单聊
         if (membersList.size() == 1) {
         if (membersList.size() == 1) {
             // 判断是否被拉黑
             // 判断是否被拉黑
-            if (imClientBlacklistService.isBeBlack(membersList.get(0).getId(), imClientSender.getId())) {
+            boolean beBlack = imClientBlacklistService.isBeBlack(membersList.get(0).getFkClientId(), imClientSender.getId());
+            if (beBlack) {
                 log.debug("被对方拉黑了");
                 log.debug("被对方拉黑了");
 
 
                 // 响应发送方
                 // 响应发送方
@@ -150,7 +151,8 @@ public class ImConcreteReceiveStrategy extends AbstractReceiveStrategy {
             }
             }
 
 
             // 是否把对方拉黑
             // 是否把对方拉黑
-            if (imClientBlacklistService.isBeBlack(imClientSender.getId(), membersList.get(0).getId())) {
+            boolean black = imClientBlacklistService.isBeBlack(imClientSender.getId(), membersList.get(0).getFkClientId());
+            if (black) {
                 log.debug("你把对方拉黑了");
                 log.debug("你把对方拉黑了");
                 // 响应发送方
                 // 响应发送方
                 ResponseModel<HashMap<String, Long>> responseModel = new ResponseModel<>();
                 ResponseModel<HashMap<String, Long>> responseModel = new ResponseModel<>();