From bc82b2e70e23b7ddc41fd3caa1d2847b1c6c4407 Mon Sep 17 00:00:00 2001
From: David Nguyen <davidngu28@gmail.com>
Date: Tue, 14 Apr 2026 21:17:16 +1000
Subject: [PATCH] fix: admin org sorting (#2694)

---
 .../trpc/server/admin-router/find-admin-organisations.ts  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/trpc/server/admin-router/find-admin-organisations.ts b/packages/trpc/server/admin-router/find-admin-organisations.ts
index e1a47566c..9e82bbec1 100644
--- a/packages/trpc/server/admin-router/find-admin-organisations.ts
+++ b/packages/trpc/server/admin-router/find-admin-organisations.ts
@@ -120,14 +120,16 @@ export const findAdminOrganisations = async ({
     };
   }
 
+  const orderBy: Prisma.OrganisationOrderByWithRelationInput[] = query
+    ? [{ subscription: { status: 'asc' } }, { name: 'asc' }]
+    : [{ createdAt: 'desc' }];
+
   const [data, count] = await Promise.all([
     prisma.organisation.findMany({
       where: whereClause,
       skip: Math.max(page - 1, 0) * perPage,
       take: perPage,
-      orderBy: {
-        createdAt: 'desc',
-      },
+      orderBy,
       select: {
         id: true,
         createdAt: true,