diff --git a/src/core/helpers/query/default-filter.helper.ts b/src/core/helpers/query/default-filter.helper.ts index 16171ed..e500a71 100644 --- a/src/core/helpers/query/default-filter.helper.ts +++ b/src/core/helpers/query/default-filter.helper.ts @@ -80,5 +80,7 @@ export function getOrderBy( : `${tableName}.${baseFilter.order_by}`; } - queryBuilder.orderBy(orderBy, orderType); + queryBuilder.orderBy(`lower(${orderBy})`, orderType); + + return queryBuilder; } diff --git a/src/modules/user-related/user-privilege/domain/usecases/user-privilege-configuration/managers/index-user-privilege-configuration.manager.ts b/src/modules/user-related/user-privilege/domain/usecases/user-privilege-configuration/managers/index-user-privilege-configuration.manager.ts index a8b25fe..7715453 100644 --- a/src/modules/user-related/user-privilege/domain/usecases/user-privilege-configuration/managers/index-user-privilege-configuration.manager.ts +++ b/src/modules/user-related/user-privilege/domain/usecases/user-privilege-configuration/managers/index-user-privilege-configuration.manager.ts @@ -12,8 +12,8 @@ import { ORDER_TYPE } from 'src/core/strings/constants/base.constants'; export class IndexUserPrivilegeConfigurationManager extends BaseIndexManager { async prepareData(): Promise { Object.assign(this.filterParam, { - order_by: `${this.tableName}.index`, - order_type: ORDER_TYPE.ASC, + order_by: this.filterParam.order_by ?? `${this.tableName}.index`, + order_type: this.filterParam.order_type ?? ORDER_TYPE.ASC, limit: 100, }); return;