diff --git a/apps/server/src/core/page/services/page.service.ts b/apps/server/src/core/page/services/page.service.ts index d07b6133..a538eedf 100644 --- a/apps/server/src/core/page/services/page.service.ts +++ b/apps/server/src/core/page/services/page.service.ts @@ -110,7 +110,7 @@ export class PageService { .select(['position']) .where('spaceId', '=', spaceId) .where('deletedAt', 'is', null) - .orderBy('position', 'desc') + .orderBy('position', (ob) => ob.collate('C').desc()) .limit(1); if (parentPageId) { @@ -191,7 +191,7 @@ export class PageService { 'deletedAt', ]) .select((eb) => this.pageRepo.withHasChildren(eb)) - .orderBy('position', 'asc') + .orderBy('position', (ob) => ob.collate('C').asc()) .where('deletedAt', 'is', null) .where('spaceId', '=', spaceId); diff --git a/apps/server/src/integrations/import/services/import.service.ts b/apps/server/src/integrations/import/services/import.service.ts index a3da4918..7901122a 100644 --- a/apps/server/src/integrations/import/services/import.service.ts +++ b/apps/server/src/integrations/import/services/import.service.ts @@ -178,7 +178,7 @@ export class ImportService { .selectFrom('pages') .select(['id', 'position']) .where('spaceId', '=', spaceId) - .orderBy('position', 'desc') + .orderBy('position', (ob) => ob.collate('C').desc()) .limit(1) .where('parentPageId', 'is', null) .executeTakeFirst();