diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 9cc51e44..5fe3b9f2 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -6411,6 +6411,22 @@ export class ProfileController extends Controller { keyword: `%${requestBody.keyword}%`, }, ) + .orWhere( + requestBody.keyword != null && requestBody.keyword != "" + ? "CONCAT(profile.prefix,profile.firstName,' ',profile.lastName) LIKE :keyword" + : "1=1", + { + keyword: `%${requestBody.keyword}%`, + }, + ) + .orWhere( + requestBody.keyword != null && requestBody.keyword != "" + ? "CONCAT(profile.firstName,' ',profile.lastName) LIKE :keyword" + : "1=1", + { + keyword: `%${requestBody.keyword}%`, + }, + ) .orWhere( requestBody.keyword != null && requestBody.keyword != "" ? "profile.citizenId LIKE :keyword" diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index e76b6d37..9bbb6226 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -3556,6 +3556,22 @@ export class ProfileEmployeeController extends Controller { keyword: `%${requestBody.keyword}%`, }, ) + .orWhere( + requestBody.keyword != null && requestBody.keyword != "" + ? "CONCAT(profileEmployee.prefix,profileEmployee.firstName,' ',profileEmployee.lastName) LIKE :keyword" + : "1=1", + { + keyword: `%${requestBody.keyword}%`, + }, + ) + .orWhere( + requestBody.keyword != null && requestBody.keyword != "" + ? "CONCAT(profileEmployee.firstName,' ',profileEmployee.lastName) LIKE :keyword" + : "1=1", + { + keyword: `%${requestBody.keyword}%`, + }, + ) .orWhere( requestBody.keyword != null && requestBody.keyword != "" ? "profileEmployee.citizenId LIKE :keyword" diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts index a2e735b2..350c706b 100644 --- a/src/controllers/ProfileEmployeeTempController.ts +++ b/src/controllers/ProfileEmployeeTempController.ts @@ -1820,6 +1820,22 @@ export class ProfileEmployeeTempController extends Controller { keyword: `%${requestBody.keyword}%`, }, ) + .orWhere( + requestBody.keyword != null && requestBody.keyword != "" + ? "CONCAT(profileEmployee.prefix,profileEmployee.firstName,' ',profileEmployee.lastName) LIKE :keyword" + : "1=1", + { + keyword: `%${requestBody.keyword}%`, + }, + ) + .orWhere( + requestBody.keyword != null && requestBody.keyword != "" + ? "CONCAT(profileEmployee.firstName,' ',profileEmployee.lastName) LIKE :keyword" + : "1=1", + { + keyword: `%${requestBody.keyword}%`, + }, + ) .orWhere( requestBody.keyword != null && requestBody.keyword != "" ? "profileEmployee.citizenId LIKE :keyword"