From 1b42808efa1d05f41ee34e09922d17782e9be0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Zatorski?= Date: Mon, 16 Dec 2024 23:02:54 +0100 Subject: [PATCH] s --- .../com/sasiedzi/event/domain/TransactionItemComparator.java | 1 + .../java/com/sasiedzi/event/domain/UserAccountComparator.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java b/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java index 8412113..7d30a96 100644 --- a/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java +++ b/src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java @@ -12,6 +12,7 @@ public class TransactionItemComparator implements Comparator { if (item1 == null && item2 == null) return 0; if (item1 == null) return -1; if (item2 == null) return 1; + if (item1.getId() == null && item2.getId() == null) return -1; if (Objects.equals(item1.getId(), item2.getId())) return 0; // Teraz porównujemy pola userAccount diff --git a/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java b/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java index 2d97047..451b0c4 100644 --- a/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java +++ b/src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java @@ -23,6 +23,7 @@ public class UserAccountComparator implements Comparator { if (ua1 == null && ua2 == null) return 0; if (ua1 == null) return -1; if (ua2 == null) return 1; + if (ua1.getId() == null && ua2.getId() == null) return -1; if (Objects.equals(ua1.getId(), ua2.getId())) return 0; String name1 = ua1.getName();