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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-04-25 09:22:39 +07:00
commit bd17564ab7
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/controllers/OrganizationUnauthorizeController.ts
View file

@ -190,6 +190,7 @@ export class OrganizationUnauthorizeController extends Controller {
const isSpecial = specialPosition ? specialPosition.isSpecial : null; const isSpecial = specialPosition ? specialPosition.isSpecial : null;
return { return {
id: item.id, id: item.id,
profileId: item.current_holder.id,
prefix: item.current_holder.prefix, prefix: item.current_holder.prefix,
firstName: item.current_holder.firstName, firstName: item.current_holder.firstName,
lastName: item.current_holder.lastName, lastName: item.current_holder.lastName,
@ -393,6 +394,7 @@ export class OrganizationUnauthorizeController extends Controller {
); );
return { return {
profileId: item.current_holder.id,
salaryLevel: item.current_holder.salaryLevel, salaryLevel: item.current_holder.salaryLevel,
group: item.current_holder.group, group: item.current_holder.group,
prefix: item.current_holder.prefix, prefix: item.current_holder.prefix,
@ -711,10 +713,10 @@ export class OrganizationUnauthorizeController extends Controller {
? null ? null
: findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4; : findProfile.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 new HttpSuccess({ return new HttpSuccess({
rootId: root == null ? null : root.id, rootId: root == null ? null : root.id,
@ -802,10 +804,10 @@ export class OrganizationUnauthorizeController extends Controller {
? null ? null
: findProfile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4; : findProfile.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 new HttpSuccess({ return new HttpSuccess({
rootId: root == null ? null : root.id, rootId: root == null ? null : root.id,