From daae16a16b1cc43814d359f176abade1fdb0b900 Mon Sep 17 00:00:00 2001
From: evan-miller-jumpmind
 <70151986+evan-miller-jumpmind@users.noreply.github.com>
Date: Mon, 17 Apr 2023 14:52:52 -0400
Subject: [PATCH] 0005798: Ordered outgoing batches by both batch ID and node
 ID

---
 .../org/jumpmind/symmetric/service/impl/AbstractService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java
index 2c9acd768f..16bced29dc 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java
@@ -324,7 +324,7 @@ protected String buildBatchOrderBy(String orderColumn, String orderDirection) {
         String orderBy = " order by ";
         if (orderColumn == null) {
             if (this instanceof OutgoingBatchService) {
-                orderBy += "batch_id desc";
+                orderBy += "batch_id desc, node_id desc";
             } else {
                 orderBy += "create_time desc";
             }