fix:最后一条消息处理

application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/impl/TourMemberImpl.java

@@ -610,17 +610,16 @@ public class TourMemberImpl extends ServiceImpl<TourImMemberMapper, TourImMember
 
         TourUser user = tourUserService.getById(userId);
         //查询 -1 -2 -3 的所有我未读的消息
-        LambdaQueryWrapper<TourImMessage> query = Wrappers.<TourImMessage>lambdaQuery().eq(TourImMessage::getRevocationTag, 0)
+        LambdaQueryWrapper<TourImMessage> query = Wrappers.<TourImMessage>lambdaQuery()
+                .eq(TourImMessage::getRevocationTag, 0)
                 .in(TourImMessage::getGroupId, ls)
                 .notLike(TourImMessage::getReadByUsers,userId)
                 .ge(TourImMessage::getCreateTime,user.getCreateTime())
                 .and(
                         qw -> qw.like(TourImMessage::getMessageContent, "\""+"getUserId"+"\""+":"+"\""+userId.toString()+"\"")
-                )
-                .or(
-                        qw -> qw.like(TourImMessage::getMessageContent,"\""+"getUserId"+"\""+":"+"\""+"null"+"\"")
+                                .or()
+                                .like(TourImMessage::getMessageContent,"\""+"getUserId"+"\""+":"+"\""+"null"+"\"")
                 );
-
         //所有未读消息数量
         List<TourImMessage> tourImMessages = tourImMessageService.getBaseMapper().selectList(query);
 
@@ -630,7 +629,7 @@ public class TourMemberImpl extends ServiceImpl<TourImMemberMapper, TourImMember
         for (MainMemberVo mainMemberVo : list) {
             List<TourImMessage> tourImMessages1 = map.get(Long.valueOf(mainMemberVo.getGroupId()));
             mainMemberVo.setUnreadMessageCount(tourImMessages1==null? 0:tourImMessages1.size() );
-            if ( mainMemberVo.getUnreadMessageCount()==0){
+            if (mainMemberVo.getUnreadMessageCount()==0){
                 mainMemberVo.setLastMessage(null);
             }
             i++;