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

#1274,#1277

Browse source
This commit is contained in:
AdisakKanthawilang 2025-03-25 14:39:20 +07:00
parent df2612adf3
commit c17e1decda
2 changed files with 30 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/controllers/ProfileEmployeeController.ts
View file

@ -2103,29 +2103,12 @@ export class ProfileEmployeeController extends Controller {
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.where( qb.where(
requestBody.keyword != null && requestBody.keyword != "" requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.prefix LIKE :keyword" ? `CONCAT(profileEmployee.prefix, profileEmployee.firstName," ",profileEmployee.lastName) LIKE :keyword`
: "1=1", : "1=1",
{ {
keyword: `%${requestBody.keyword}%`, keyword: `%${requestBody.keyword}%`,
}, })
)
.orWhere(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.firstName LIKE :keyword"
: "1=1",
{
keyword: `%${requestBody.keyword}%`,
},
)
.orWhere(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.lastName LIKE :keyword"
: "1=1",
{
keyword: `%${requestBody.keyword}%`,
},
)
.orWhere( .orWhere(
requestBody.keyword != null && requestBody.keyword != "" requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.citizenId LIKE :keyword" ? "profileEmployee.citizenId LIKE :keyword"

47
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1703,28 +1703,11 @@ export class ProfileEmployeeTempController extends Controller {
new Brackets((qb) => { new Brackets((qb) => {
qb.where( qb.where(
requestBody.keyword != null && requestBody.keyword != "" requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.prefix LIKE :keyword" ? `CONCAT(profileEmployee.prefix, profileEmployee.firstName," ",profileEmployee.lastName) LIKE :keyword`
: "1=1", : "1=1",
{ {
keyword: `%${requestBody.keyword}%`, keyword: `%${requestBody.keyword}%`,
}, })
)
.orWhere(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.firstName LIKE :keyword"
: "1=1",
{
keyword: `%${requestBody.keyword}%`,
},
)
.orWhere(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.lastName LIKE :keyword"
: "1=1",
{
keyword: `%${requestBody.keyword}%`,
},
)
.orWhere( .orWhere(
requestBody.keyword != null && requestBody.keyword != "" requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.citizenId LIKE :keyword" ? "profileEmployee.citizenId LIKE :keyword"
@ -1732,7 +1715,31 @@ export class ProfileEmployeeTempController extends Controller {
{ {
keyword: `%${requestBody.keyword}%`, keyword: `%${requestBody.keyword}%`,
}, },
); )
// .orWhere(
// requestBody.keyword != null && requestBody.keyword != ""
// ? "profileEmployee.position LIKE :keyword"
// : "1=1",
// {
// keyword: `%${requestBody.keyword}%`,
// },
// )
// .orWhere(
// requestBody.keyword != null && requestBody.keyword != ""
// ? "posType.posTypeName LIKE :keyword"
// : "1=1",
// {
// keyword: `%${requestBody.keyword}%`,
// },
// )
// .orWhere(
// requestBody.keyword != null && requestBody.keyword != ""
// ? `CONCAT(posType.posTypeShortName," ",posLevel.posLevelName) LIKE :keyword`
// : "1=1",
// {
// keyword: `%${requestBody.keyword}%`,
// },
// );
}), }),
) )
.andWhere( .andWhere(