sonar--npe

src/main/java/cn/quantgroup/xyqb/service/user/impl/ContactServiceImpl.java

@@ -103,18 +103,27 @@ public class ContactServiceImpl implements IContactService {
     private void mergeContacts(Long userId, List<Contact> contacts) {
         // 当前联系人列表
         List<Contact> userContact = contactRepository.findByUserId(userId);
-        int userContactCount = (userContact == null) ? 0 : userContact.size();
         Timestamp now = new Timestamp(System.currentTimeMillis());
         for (int i = 0; i < contacts.size(); i++) {
             Contact c = contacts.get(i);
             c.setId(null);
             c.setUserId(userId);
-            c.setRelation(c.getRelation() == null ? Relation.OTHER : c.getRelation());
-            c.setCreatedAt(now);
+            if(Objects.isNull(c.getRelation())){
+                c.setRelation(Relation.OTHER);
+            }
             c.setUpdateAt(now);
-            if (userContactCount > i) {
-                c.setId(userContact.get(i).getId());
-                c.setCreatedAt(userContact.get(i).getCreatedAt() == null ? now : userContact.get(i).getCreatedAt());
+            if (CollectionUtils.isEmpty(userContact) || userContact.size() <= i) {
+                continue;
+            }
+            Contact old = userContact.get(i);
+            if(Objects.isNull(old)){
+                continue;
+            }
+            c.setId(old.getId());
+            if(Objects.nonNull(old.getCreatedAt())){
+                c.setCreatedAt(old.getCreatedAt());
+            }else{
+                c.setCreatedAt(now);
             }
         }
     }