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

no message

Browse source
This commit is contained in:
kittapath 2025-01-21 10:28:41 +07:00
parent dd2780a06f
commit 33533d5638
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/ProfileController.ts
View file

@ -4649,10 +4649,10 @@ export class ProfileController extends Controller {
? null ? null
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4; : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4;
let _child1 = child1 == null ? "" : `${child1.orgChild1Name}/`; let _child1 = child1 == null ? "" : `${child1.orgChild1Name} `;
let _child2 = child2 == null ? "" : `${child2.orgChild2Name}/`; let _child2 = child2 == null ? "" : `${child2.orgChild2Name} `;
let _child3 = child3 == null ? "" : `${child3.orgChild3Name}/`; let _child3 = child3 == null ? "" : `${child3.orgChild3Name} `;
let _child4 = child4 == null ? "" : `${child4.orgChild4Name}/`; let _child4 = child4 == null ? "" : `${child4.orgChild4Name} `;
return { return {
id: _data.id, id: _data.id,
@ -7335,6 +7335,7 @@ export class ProfileController extends Controller {
.orWhere(`posType.posTypeName LIKE :keyword`, { .orWhere(`posType.posTypeName LIKE :keyword`, {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,
}) })
.where("profile.isLeave = false")
.orWhere(conditionFullName, { .orWhere(conditionFullName, {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,
}) })

8
src/controllers/ProfileEmployeeController.ts
View file

@ -1714,10 +1714,10 @@ export class ProfileEmployeeController extends Controller {
? null ? null
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4; : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4;
let _child1 = child1 == null ? "" : `${child1.orgChild1Name}/`; let _child1 = child1 == null ? "" : `${child1.orgChild1Name} `;
let _child2 = child2 == null ? "" : `${child2.orgChild2Name}/`; let _child2 = child2 == null ? "" : `${child2.orgChild2Name} `;
let _child3 = child3 == null ? "" : `${child3.orgChild3Name}/`; let _child3 = child3 == null ? "" : `${child3.orgChild3Name} `;
let _child4 = child4 == null ? "" : `${child4.orgChild4Name}/`; let _child4 = child4 == null ? "" : `${child4.orgChild4Name} `;
return { return {
id: _data.id, id: _data.id,
prefix: _data.prefix, prefix: _data.prefix,