From d0c5d90033e954c9689a46854d535e4554dad854 Mon Sep 17 00:00:00 2001
From: Adisak <adisak@frappet.com>
Date: Wed, 20 May 2026 16:27:39 +0700
Subject: [PATCH] #2508

---
 src/controllers/OrganizationController.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index eb91c408..960b4815 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -5807,6 +5807,7 @@ export class OrganizationController extends Controller {
       .leftJoin("orgRoot.posMasters", "posMasters")
       .leftJoin("posMasters.current_holder", "current_holder")
       .orderBy("orgRoot.orgRootOrder", "ASC")
+      .addOrderBy("posMasters.posMasterOrder", "ASC")
       .getMany();
 
     const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null;
@@ -5847,6 +5848,7 @@ export class OrganizationController extends Controller {
             .leftJoin("orgChild1.posMasters", "posMasters")
             .leftJoin("posMasters.current_holder", "current_holder")
             .orderBy("orgChild1.orgChild1Order", "ASC")
+            .addOrderBy("posMasters.posMasterOrder", "ASC")
             .getMany()
         : [];
 
@@ -5888,6 +5890,7 @@ export class OrganizationController extends Controller {
             .leftJoin("orgChild2.posMasters", "posMasters")
             .leftJoin("posMasters.current_holder", "current_holder")
             .orderBy("orgChild2.orgChild2Order", "ASC")
+            .addOrderBy("posMasters.posMasterOrder", "ASC")
             .getMany()
         : [];
 
@@ -5929,6 +5932,7 @@ export class OrganizationController extends Controller {
             .leftJoin("orgChild3.posMasters", "posMasters")
             .leftJoin("posMasters.current_holder", "current_holder")
             .orderBy("orgChild3.orgChild3Order", "ASC")
+            .addOrderBy("posMasters.posMasterOrder", "ASC")
             .getMany()
         : [];
 
@@ -5965,6 +5969,7 @@ export class OrganizationController extends Controller {
             .leftJoin("orgChild4.posMasters", "posMasters")
             .leftJoin("posMasters.current_holder", "current_holder")
             .orderBy("orgChild4.orgChild4Order", "ASC")
+            .addOrderBy("posMasters.posMasterOrder", "ASC")
             .getMany()
         : [];