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

Merge branch 'develop' into develop-Bright

Browse source 
# Conflicts:
#	src/controllers/PositionController.ts
This commit is contained in:
Bright 2024-04-26 17:16:18 +07:00
commit 8b9b7bf4b3
2 changed files with 61 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/PositionController.ts
View file

@ -841,6 +841,7 @@ export class PositionController extends Controller {
where: {
orgChild3: { orgChild3ShortName: SName },
posMasterNo: requestBody.posMasterNo,
orgChild4Id: IsNull(),
id: Not(posMaster.id),
},
});
@ -855,6 +856,7 @@ export class PositionController extends Controller {
where: {
orgChild2: { orgChild2ShortName: SName },
posMasterNo: requestBody.posMasterNo,
orgChild3Id: IsNull(),
id: Not(posMaster.id),
},
});
@ -869,6 +871,7 @@ export class PositionController extends Controller {
where: {
orgChild1: { orgChild1ShortName: SName },
posMasterNo: requestBody.posMasterNo,
orgChild2Id: IsNull(),
id: Not(posMaster.id),
},
});
@ -883,6 +886,7 @@ export class PositionController extends Controller {
where: {
orgRoot: { orgRootShortName: SName },
posMasterNo: requestBody.posMasterNo,
orgChild1Id: IsNull(),
id: Not(posMaster.id),
},
});