hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix order

Browse source
This commit is contained in:
Bright 2025-02-19 17:47:38 +07:00
parent 7908473d1f
commit fbdce54a12
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileController.ts
View file

@ -4659,7 +4659,7 @@ export class ProfileController extends Controller {
@Query() nodeId?: string, @Query() nodeId?: string,
@Query() isAll?: boolean, @Query() isAll?: boolean,
@Query() retireType?: string, @Query() retireType?: string,
@Query() sortBy: string = "posMasterNo", @Query() sortBy: string = "current_holders.posMasterNo",
@Query() sort: "ASC"|"DESC" = "ASC", @Query() sort: "ASC"|"DESC" = "ASC",
) { ) {
let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_OFFICER"); let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_OFFICER");
@ -4817,7 +4817,7 @@ export class ProfileController extends Controller {
}), }),
) )
// .orderBy("current_holders.posMasterNo", "ASC") // .orderBy("current_holders.posMasterNo", "ASC")
.orderBy(`current_holders.${sortBy}`, sort) .orderBy(`${sortBy}`, sort)
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
.take(pageSize) .take(pageSize)
.getManyAndCount(); .getManyAndCount();

4
src/controllers/ProfileEmployeeController.ts
View file

@ -1704,7 +1704,7 @@ export class ProfileEmployeeController extends Controller {
@Query() nodeId?: string, @Query() nodeId?: string,
@Query() isAll?: boolean, @Query() isAll?: boolean,
@Query() retireType?: string, @Query() retireType?: string,
@Query() sortBy: string = "posMasterNo", @Query() sortBy: string = "current_holders.posMasterNo",
@Query() sort: "ASC"|"DESC" = "ASC", @Query() sort: "ASC"|"DESC" = "ASC",
) { ) {
let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_EMP"); let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_EMP");
@ -1863,7 +1863,7 @@ export class ProfileEmployeeController extends Controller {
// orgRevisionId: findRevision.id, // orgRevisionId: findRevision.id,
// }) // })
// .orderBy("current_holders.posMasterNo", "ASC") // .orderBy("current_holders.posMasterNo", "ASC")
.orderBy(`current_holders.${sortBy}`, sort) .orderBy(`${sortBy}`, sort)
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
.take(pageSize) .take(pageSize)
.getManyAndCount(); .getManyAndCount();