diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index bcb0fddf..280e358e 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -2700,10 +2700,10 @@ export class PositionController extends Controller { .andWhere( new Brackets((qb) => { qb.andWhere(typeCondition).andWhere(conditionA == null ? "1=1" : conditionA, { - posType: posType == null ? `%%` : `%${posType.id}%`, - posLevel: posLevel == null ? `%%` : `%${posLevel.id}%`, - posTypeRank: posType == null ? "" : posType.posTypeRank, - posLevelRank: posLevel == null ? "" : posLevel.posLevelRank, + posType: posType == null ? `%%` : `${posType.id}`, + posLevel: posLevel == null ? `%%` : `${posLevel.id}`, + posTypeRank: posType == null ? 0 : posType.posTypeRank, + posLevelRank: posLevel == null ? 0 : posLevel.posLevelRank, }); }), ) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 8781a4f6..fb1a01c6 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -3293,6 +3293,7 @@ export class ProfileController extends Controller { citizenId: profile.citizenId, position: profile.position, leaveDate: profile.dateLeave, + posMasterId: posMaster == null ? null : posMaster.id, posMasterNo: posMaster == null ? null : posMaster.posMasterNo, posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName, 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, posTypeRank: profile.posType == null ? null : profile.posType.posTypeRank, posTypeId: profile.posType == null ? null : profile.posType.id, + orgRevisionId: root == null ? null : root.orgRevisionId, rootId: root == null ? null : root.id, root: root == null ? null : root.orgRootName, rootShortName: root == null ? null : root.orgRootShortName,