Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

This commit is contained in:
kittapath 2024-11-05 15:00:46 +07:00
commit 44c1b8b903

View file

@ -5377,6 +5377,7 @@ export class OrganizationController extends Controller {
)
.map(async (x) => ({
posmasterId: x.id,
posNo: x.isDirector == true ? orgRoot.orgRootShortName + x.posMasterNo: null,
orgTreeId: orgRoot.id,
orgLevel: 0,
fullNameCurrentHolder:
@ -5415,6 +5416,7 @@ export class OrganizationController extends Controller {
)
.map(async (x) => ({
posmasterId: x.id,
posNo: x.isDirector == true ? orgChild1.orgChild1ShortName + x.posMasterNo: null,
orgTreeId: orgChild1.id,
orgLevel: 1,
fullNameCurrentHolder:
@ -5454,6 +5456,7 @@ export class OrganizationController extends Controller {
)
.map(async (x) => ({
posmasterId: x.id,
posNo: x.isDirector == true ? orgChild2.orgChild2ShortName + x.posMasterNo: null,
orgTreeId: orgChild2.id,
orgLevel: 2,
fullNameCurrentHolder:
@ -5493,6 +5496,7 @@ export class OrganizationController extends Controller {
)
.map(async (x) => ({
posmasterId: x.id,
posNo: x.isDirector == true ? orgChild3.orgChild3ShortName + x.posMasterNo: null,
orgTreeId: orgChild3.id,
orgLevel: 3,
fullNameCurrentHolder:
@ -5529,6 +5533,7 @@ export class OrganizationController extends Controller {
)
.map(async (x) => ({
posmasterId: x.id,
posNo: x.isDirector == true ? orgChild4.orgChild4ShortName + x.posMasterNo: null,
orgTreeId: orgChild4.id,
orgLevel: 4,
fullNameCurrentHolder: