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

ปรับ paging

Browse source
This commit is contained in:
Bright 2024-03-21 10:49:30 +07:00
parent fc712baa8f
commit 248dd12508
1 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/controllers/ProfileEmployeeController.ts
View file

@ -244,32 +244,39 @@ export class ProfileEmployeeController extends Controller {
"posLevelId",
"posTypeId",
],
where: {
prefix: Like(`%${keyword}%`),
firstName: Like(`%${keyword}%`),
lastName: Like(`%${keyword}%`),
citizenId: Like(`%${keyword}%`),
position: Like(`%${keyword}%`),
},
order: { createdAt: "ASC" },
skip: (page - 1) * pageSize,
take: pageSize,
});
if (keyword != undefined && keyword !== "") {
const formattedKeyword = keyword.toLowerCase().replace(/\s+/g, "");
const filteredProfile = profile.filter(
(x) =>
(x.prefix + x.firstName + x.lastName).replace(/\s+/g, "").includes(formattedKeyword) ||
x.citizenId?.toString().includes(keyword) ||
x.position?.toString().includes(keyword),
);
// if (keyword != undefined && keyword !== "") {
// const formattedKeyword = keyword.toLowerCase().replace(/\s+/g, "");
// const filteredProfile = profile.filter(
// (x) =>
// (x.prefix + x.firstName + x.lastName).replace(/\s+/g, "").includes(formattedKeyword) ||
// x.citizenId?.toString().includes(keyword) ||
// x.position?.toString().includes(keyword),
// );
const formattedData = filteredProfile.map((item) => ({
id: item.id,
prefix: item.prefix,
firstName: item.firstName,
lastName: item.lastName,
citizenId: item.citizenId,
position: item.position,
posLevelId: item.posLevelId,
posTypeId: item.posTypeId,
}));
// const formattedData = filteredProfile.map((item) => ({
// id: item.id,
// prefix: item.prefix,
// firstName: item.firstName,
// lastName: item.lastName,
// citizenId: item.citizenId,
// position: item.position,
// posLevelId: item.posLevelId,
// posTypeId: item.posTypeId,
// }));
return new HttpSuccess({ data: formattedData, total: formattedData.length });
}
// return new HttpSuccess({ data: formattedData, total: formattedData.length });
// }
const formattedData = profile.map((item) => ({
id: item.id,