bug fix

core/src/main/java/com/wecloud/im/friend/mapper/ImFriendMapper.java

@@ -33,5 +33,11 @@ public interface ImFriendMapper extends BaseMapper<ImFriend> {
      */
      */
     List<Long> filterNegativeFriends(@Param("clientId") Long fkClientId, @Param("friendClientIds") List<Long> fkFriendClientIds);
     List<Long> filterNegativeFriends(@Param("clientId") Long fkClientId, @Param("friendClientIds") List<Long> fkFriendClientIds);
 
 
+    /**
+     * 批量删除好友
+     * @param fkClientId 删除人的clientId
+     * @param fkAppId
+     * @param friendClientIds 被删除人的clientId列表
+     */
     void batchDeleteFriend(@Param("clientId") Long fkClientId, @Param("fkAppId") Long fkAppId, @Param("friendClientIds") List<String> friendClientIds);
     void batchDeleteFriend(@Param("clientId") Long fkClientId, @Param("fkAppId") Long fkAppId, @Param("friendClientIds") List<String> friendClientIds);
 }
 }

core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java

@@ -501,7 +501,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::getId, imClientSender.getId())
+                        .notIn(ImConversationMembers::getFkClientId, imClientSender.getId())
         );
         );
 
 
         if (membersList.isEmpty()) {
         if (membersList.isEmpty()) {

core/src/main/java/com/wecloud/rtc/service/impl/RtcServiceImpl.java

@@ -99,7 +99,7 @@ public class RtcServiceImpl extends UserStateListener implements RtcService {
         // ws向接收方发送通知
         // ws向接收方发送通知
         RtcCallResponse rtcCallResponse = new RtcCallResponse();
         RtcCallResponse rtcCallResponse = new RtcCallResponse();
         rtcCallResponse.setCallType(createRtcChannelParam.getCallType());
         rtcCallResponse.setCallType(createRtcChannelParam.getCallType());
-//        rtcCallResponse.setConversationId(createRtcChannelParam.getConversationId());
+        rtcCallResponse.setConversationId(createRtcChannelParam.getConversationId());
         rtcCallResponse.setChannelId(rtcChannelId);
         rtcCallResponse.setChannelId(rtcChannelId);
         rtcCallResponse.setClientId(currentClient.getClientId());
         rtcCallResponse.setClientId(currentClient.getClientId());
         rtcCallResponse.setTimestamp(System.currentTimeMillis());
         rtcCallResponse.setTimestamp(System.currentTimeMillis());

core/src/main/resources/mapper/ImFriendMapper.xml

@@ -45,8 +45,8 @@
     <update id="batchDeleteFriend">
     <update id="batchDeleteFriend">
         update im_friend set state = 4 where fk_client_id = #{clientId} and fk_client_id_friend in (
         update im_friend set state = 4 where fk_client_id = #{clientId} and fk_client_id_friend in (
         select id from im_client where (fk_appid, client_id) in
         select id from im_client where (fk_appid, client_id) in
-        <foreach collection="friendClientIds" item="friendCLientId" open="(" close=")" separator=",">
-            (#{fkAppId}, #{friendCLientId})
+        <foreach collection="friendClientIds" item="friendClientId" open="(" close=")" separator=",">
+            (#{fkAppId}, #{friendClientId})
         </foreach>
         </foreach>
         )
         )
     </update>
     </update>

core/src/main/resources/mapper/ImMessageMapper.xml

@@ -70,11 +70,11 @@
         FROM `im_message`
         FROM `im_message`
                  INNER JOIN `im_client` ON `im_client`.id = `im_message`.sender
                  INNER JOIN `im_client` ON `im_client`.id = `im_message`.sender
         WHERE fk_conversation_id = #{param.conversationId}
         WHERE fk_conversation_id = #{param.conversationId}
-        <if test="msgIdStart != null">
-            AND im_message.id > #{msgIdStart}
+        <if test="param.msgIdStart != null">
+            AND im_message.id > #{param.msgIdStart}
         </if>
         </if>
-        <if test="msgIdEnd != null">
-            AND im_message.id <![CDATA[ < ]]> #{msgIdEnd}
+        <if test="param.msgIdEnd != null">
+            AND im_message.id <![CDATA[ < ]]> #{param.msgIdEnd}
         </if>
         </if>
 
 
         ORDER BY `im_message`.`create_time` DESC
         ORDER BY `im_message`.`create_time` DESC