bug 聊天问题

src/main/java/com/huiju/estateagents/service/impl/TaChatServiceImpl.java

@@ -85,23 +85,25 @@ public class TaChatServiceImpl extends ServiceImpl<TaChatMapper, TaChat> impleme
         List<Map<String, Object>> friendList = new ArrayList<>();
         if (null != result && result.size() > 0) {
             for (TaChat taChat: result) {
-                boolean isSend = taChat.getSendPerson().equals(personId) ? true : false;
-                String chatWith = isSend ? taChat.getReceivePerson() : taChat.getSendPerson();
-                String name = isSend ? taChat.getReceiveName() : taChat.getSendName();
-                String chatAvatar = isSend ? taChat.getReceiveAvatar() : taChat.getSendAvatar();
-                Integer unReadNum = taChatMapper.getUnReadMessage(personId, chatWith);
-
-                Map<String, Object> friend = new HashMap<>();
-                friend.put("friendId", chatWith);
-                friend.put("name", name);
-                friend.put("avatar", chatAvatar);
-                friend.put("messageType", taChat.getMessageType());
-                friend.put("message", taChat.getMessage());
-                friend.put("createDate", taChat.getCreateDate());
-                friend.put("unReadNum", unReadNum);
-                friend.put("isSend", isSend);
-
-                friendList.add(friend);
+                if (null != taChat.getSendPerson() && null != taChat.getSendAvatar() && null != taChat.getSendName() && null != taChat.getReceivePerson()){
+                    boolean isSend = taChat.getSendPerson().equals(personId) ? true : false;
+                    String chatWith = isSend ? taChat.getReceivePerson() : taChat.getSendPerson();
+                    String name = isSend ? taChat.getReceiveName() : taChat.getSendName();
+                    String chatAvatar = isSend ? taChat.getReceiveAvatar() : taChat.getSendAvatar();
+                    Integer unReadNum = taChatMapper.getUnReadMessage(personId, chatWith);
+
+                    Map<String, Object> friend = new HashMap<>();
+                    friend.put("friendId", chatWith);
+                    friend.put("name", name);
+                    friend.put("avatar", chatAvatar);
+                    friend.put("messageType", taChat.getMessageType());
+                    friend.put("message", taChat.getMessage());
+                    friend.put("createDate", taChat.getCreateDate());
+                    friend.put("unReadNum", unReadNum);
+                    friend.put("isSend", isSend);
+
+                    friendList.add(friend);
+                }
             }
         }