From 33533d56389972cfe423ff97dfd84d8f881e523c Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 21 Jan 2025 10:28:41 +0700 Subject: [PATCH] no message --- src/controllers/ProfileController.ts | 9 +++++---- src/controllers/ProfileEmployeeController.ts | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index f9164a43..6581f3ec 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -4649,10 +4649,10 @@ export class ProfileController extends Controller { ? null : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4; - let _child1 = child1 == null ? "" : `${child1.orgChild1Name}/`; - let _child2 = child2 == null ? "" : `${child2.orgChild2Name}/`; - let _child3 = child3 == null ? "" : `${child3.orgChild3Name}/`; - let _child4 = child4 == null ? "" : `${child4.orgChild4Name}/`; + let _child1 = child1 == null ? "" : `${child1.orgChild1Name} `; + let _child2 = child2 == null ? "" : `${child2.orgChild2Name} `; + let _child3 = child3 == null ? "" : `${child3.orgChild3Name} `; + let _child4 = child4 == null ? "" : `${child4.orgChild4Name} `; return { id: _data.id, @@ -7335,6 +7335,7 @@ export class ProfileController extends Controller { .orWhere(`posType.posTypeName LIKE :keyword`, { keyword: `%${body.keyword}%`, }) + .where("profile.isLeave = false") .orWhere(conditionFullName, { keyword: `%${body.keyword}%`, }) diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 6ed73feb..3798b6af 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -1714,10 +1714,10 @@ export class ProfileEmployeeController extends Controller { ? null : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4; - let _child1 = child1 == null ? "" : `${child1.orgChild1Name}/`; - let _child2 = child2 == null ? "" : `${child2.orgChild2Name}/`; - let _child3 = child3 == null ? "" : `${child3.orgChild3Name}/`; - let _child4 = child4 == null ? "" : `${child4.orgChild4Name}/`; + let _child1 = child1 == null ? "" : `${child1.orgChild1Name} `; + let _child2 = child2 == null ? "" : `${child2.orgChild2Name} `; + let _child3 = child3 == null ? "" : `${child3.orgChild3Name} `; + let _child4 = child4 == null ? "" : `${child4.orgChild4Name} `; return { id: _data.id, prefix: _data.prefix,