陌生人修改

alien-store/src/main/java/shop/alien/store/service/impl/LifeMessageServiceImpl.java

@@ -227,9 +227,21 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
             wrapper.orderByDesc("message.created_time");
 //        IPage<LifeMessageVo> ipage = new Page<>(1, Integer.MAX_VALUE);
             List<LifeMessageVo> lifeMessageVoList = lifeMessageMapper.getLifeMessagePageByPhoneId(receiverId, wrapper);
+            LifeMessageVo messageVos = null;
+            if(CollectionUtils.isEmpty(lifeMessageVoList)){
+                return messageVos;
+            }
 
-            LifeMessageVo messageVo = lifeMessageVoList.stream().max(Comparator.comparing(LifeMessageVo::getCreatedTime)).orElse(null);
-            if (messageVo != null) {
+            lifeMessageVoList.sort(Comparator.comparing(LifeMessageVo::getCreatedTime).reversed());
+            for(LifeMessageVo messageVo : lifeMessageVoList) {
+                int messageId = messageVo.getId();
+                LifeMessage lifeMessage = lifeMessageMapper.selectById(messageId);
+                if(lifeMessage!=null){
+                    String senderId = lifeMessage.getSenderId();
+                    if (senderId != null && senderId.startsWith("lawyer_")) {
+                        continue;
+                    }
+                }
                 messageVo.setNotReadCount(lifeMessageVoList.stream().filter(item -> 0 == item.getIsRead()).count());
                 // 根据手机号查询发送人信息
                 String storePhones = "''";
@@ -244,9 +256,10 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
                     messageVo.setUserName(userList.get(0).getUserName());
                     messageVo.setUserImage(userList.get(0).getUserImage());
                 }
+                messageVos = messageVo;
+                break;
             }
-
-            return messageVo;
+            return messageVos;
         } catch (Exception e) {
             log.error("LifeMessageServiceImpl.getNoFriendMessageNum Error Mgs={}", e.getMessage());
             throw new Exception(e);