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-10-29 09:44:08 +07:00
commit cca4e837bc
4 changed files with 92 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileController.ts
View file

@ -3885,7 +3885,7 @@ export class ProfileController extends Controller {
},
relations: ["orgChild1"],
});
if (posMasters == null || posMasters.orgChild1 == null) {
if (posMasters == null) {
return new HttpSuccess({
isOfficer: null,
rootId: null,
@ -3896,7 +3896,7 @@ export class ProfileController extends Controller {
});
}
return new HttpSuccess({
isOfficer: posMasters?.orgChild1?.isOfficer || null,
isOfficer: posMasters?.orgChild1?.isOfficer || false,
rootId: posMasters?.orgRootId || null,
child1Id: posMasters?.orgChild1Id || null,
child2Id: posMasters?.orgChild2Id || null,