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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
kittapath 2024-11-29 18:09:29 +07:00
commit 40fe2d0b2c
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/controllers/ProfileController.ts
View file

@ -4100,10 +4100,6 @@ export class ProfileController extends Controller {
IFNULL(orgRoot.orgRootShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword`;
// queryLike = `CONCAT(
// IFNULL(orgRoot.orgRootShortName, ''),
// IFNULL(current_holders.posMasterNo , '')
// ) LIKE :keyword`;
}
let nodeCondition = "1=1";
let nodeAll = "";
@ -7021,6 +7017,14 @@ export class ProfileController extends Controller {
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "CONCAT(current_holder.prefix,current_holder.firstName,' ',current_holder.lastName) LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "current_holder.position LIKE :keyword"

10
src/controllers/ProfileEmployeeController.ts
View file

@ -2891,6 +2891,14 @@ export class ProfileEmployeeController extends Controller {
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "CONCAT(current_holder.prefix,current_holder.firstName,' ',current_holder.lastName) LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "current_holder.position LIKE :keyword"
@ -2918,7 +2926,7 @@ export class ProfileEmployeeController extends Controller {
)
.orWhere(
body.keyword != null && body.keyword != ""
? "posLevel.posLevelName LIKE :keyword"
? "CONCAT(posType.posTypeShortName,' ',posLevel.posLevelName) LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,