Fixed #13773

primefaces · Dec 1, 2023 · 0618958 · 0618958
1 parent c79a252
commit 0618958
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/app/components/utils/objectutils.ts b/src/app/components/utils/objectutils.ts
@@ -190,8 +190,12 @@ export class ObjectUtils {
 
     public static sort(value1, value2, order = 1, locale, nullSortOrder = 1) {
         const result = ObjectUtils.compare(value1, value2, locale, order);
+        let finalSortOrder = order;
+
         // nullSortOrder == 1 means Excel like sort nulls at bottom
-        const finalSortOrder = nullSortOrder === 1 ? order : nullSortOrder;
+        if (ObjectUtils.isEmpty(value1) || ObjectUtils.isEmpty(value2)) {
+            finalSortOrder = nullSortOrder === 1 ? order : nullSortOrder;
+        }
 
         return finalSortOrder * result;
     }