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

เช็ค ระบบเงินเดือน #813

Browse source
This commit is contained in:
AdisakKanthawilang 2024-11-29 16:53:05 +07:00
parent 03f269ddd0
commit 15db387e7a
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"