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-07-18 21:22:02 +07:00
commit 0696672f86
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/PositionController.ts
View file

@ -2700,10 +2700,10 @@ export class PositionController extends Controller {
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.andWhere(typeCondition).andWhere(conditionA == null ? "1=1" : conditionA, { qb.andWhere(typeCondition).andWhere(conditionA == null ? "1=1" : conditionA, {
posType: posType == null ? `%%` : `%${posType.id}%`, posType: posType == null ? `%%` : `${posType.id}`,
posLevel: posLevel == null ? `%%` : `%${posLevel.id}%`, posLevel: posLevel == null ? `%%` : `${posLevel.id}`,
posTypeRank: posType == null ? "" : posType.posTypeRank, posTypeRank: posType == null ? 0 : posType.posTypeRank,
posLevelRank: posLevel == null ? "" : posLevel.posLevelRank, posLevelRank: posLevel == null ? 0 : posLevel.posLevelRank,
}); });
}), }),
) )

2
src/controllers/ProfileController.ts
View file

@ -3293,6 +3293,7 @@ export class ProfileController extends Controller {
citizenId: profile.citizenId, citizenId: profile.citizenId,
position: profile.position, position: profile.position,
leaveDate: profile.dateLeave, leaveDate: profile.dateLeave,
posMasterId: posMaster == null ? null : posMaster.id,
posMasterNo: posMaster == null ? null : posMaster.posMasterNo, posMasterNo: posMaster == null ? null : posMaster.posMasterNo,
posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName, posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName,
posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank, posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank,
@ -3300,6 +3301,7 @@ export class ProfileController extends Controller {
posTypeName: profile.posType == null ? null : profile.posType.posTypeName, posTypeName: profile.posType == null ? null : profile.posType.posTypeName,
posTypeRank: profile.posType == null ? null : profile.posType.posTypeRank, posTypeRank: profile.posType == null ? null : profile.posType.posTypeRank,
posTypeId: profile.posType == null ? null : profile.posType.id, posTypeId: profile.posType == null ? null : profile.posType.id,
orgRevisionId: root == null ? null : root.orgRevisionId,
rootId: root == null ? null : root.id, rootId: root == null ? null : root.id,
root: root == null ? null : root.orgRootName, root: root == null ? null : root.orgRootName,
rootShortName: root == null ? null : root.orgRootShortName, rootShortName: root == null ? null : root.orgRootShortName,