Fix sorting by association attribute if the have null value #121

cuba-platform · Oct 8, 2020 · ef729e5 · ef729e5
1 parent 5aeb2d7
commit ef729e5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/rest-api/src/com/haulmont/addon/restapi/api/service/EntitiesControllerManager.java b/modules/rest-api/src/com/haulmont/addon/restapi/api/service/EntitiesControllerManager.java
@@ -345,11 +345,11 @@ protected String addOrderBy(String queryString, @Nullable String sort, MetaClass
             if (propertyPath != null) {
                 switch (order) {
                     case "-":
-                        order = " desc, ";
+                        order = " desc NULLS LAST, ";
                         break;
                     case "+":
                     default:
-                        order = " asc, ";
+                        order = " asc NULLS FIRST, ";
                         break;
                 }
                 MetaProperty metaProperty = propertyPath.getMetaProperty();