fix native queries order by

Activiti · Apr 22, 2024 · 358efa0 · 358efa0
1 parent 43333e4
commit 358efa0
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/...viti-core/activiti-engine/src/main/java/org/activiti/engine/impl/AbstractNativeQuery.java b/...viti-core/activiti-engine/src/main/java/org/activiti/engine/impl/AbstractNativeQuery.java
@@ -122,11 +122,8 @@ public Object execute(CommandContext commandContext) {
       parameterMap.put("resultType", "LIST_PAGE");
       parameterMap.put("firstResult", firstResult);
       parameterMap.put("maxResults", maxResults);
-      if (StringUtils.isNotBlank(Objects.toString(parameterMap.get("orderBy")))) {
-        parameterMap.put("orderByColumns", "RES." + parameterMap.get("orderBy"));
-      } else {
-        parameterMap.put("orderByColumns", "RES.ID_ asc");
-      }
+      Object orderBy = parameterMap.getOrDefault("orderBy", "ID_ asc");
+      parameterMap.put("orderByColumns", "RES." + orderBy);
 
       int firstRow = firstResult + 1;
       parameterMap.put("firstRow", firstRow);