From 3970a03133464b10570059101a066927e535a20e Mon Sep 17 00:00:00 2001 From: Kittapath Date: Thu, 25 Apr 2024 00:36:54 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1pr?= =?UTF-8?q?ofile=E0=B9=83=E0=B8=99report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OrganizationUnauthorizeController.ts | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/controllers/OrganizationUnauthorizeController.ts b/src/controllers/OrganizationUnauthorizeController.ts index 35f37b32..fc9351b8 100644 --- a/src/controllers/OrganizationUnauthorizeController.ts +++ b/src/controllers/OrganizationUnauthorizeController.ts @@ -190,6 +190,7 @@ export class OrganizationUnauthorizeController extends Controller { const isSpecial = specialPosition ? specialPosition.isSpecial : null; return { id: item.id, + profileId: item.current_holder.id, prefix: item.current_holder.prefix, firstName: item.current_holder.firstName, lastName: item.current_holder.lastName, @@ -393,6 +394,7 @@ export class OrganizationUnauthorizeController extends Controller { ); return { + profileId: item.current_holder.id, salaryLevel: item.current_holder.salaryLevel, group: item.current_holder.group, prefix: item.current_holder.prefix, @@ -682,7 +684,7 @@ export class OrganizationUnauthorizeController extends Controller { findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null ? null : findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot; - + const child1 = findProfile.current_holders == null || findProfile.current_holders.length == 0 || @@ -703,7 +705,7 @@ export class OrganizationUnauthorizeController extends Controller { findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null ? null : findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3; - + const child4 = findProfile.current_holders == null || findProfile.current_holders.length == 0 || @@ -711,10 +713,10 @@ export class OrganizationUnauthorizeController extends Controller { ? null : findProfile.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 new HttpSuccess({ rootId: root == null ? null : root.id, @@ -794,18 +796,18 @@ export class OrganizationUnauthorizeController extends Controller { findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null ? null : findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3; - + const child4 = findProfile.current_holders == null || findProfile.current_holders.length == 0 || findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null ? null : findProfile.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 new HttpSuccess({ rootId: root == null ? null : root.id,