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

Task #2207 กรณีคนขอโอนอยู่ในสำนักปลัดกรุงเทพมหานคร
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m2s
Details

Browse source
This commit is contained in:
harid 2026-01-20 16:40:10 +07:00
parent 7423a4f8b5
commit b1210d51e8
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/ProfileController.ts
View file

@ -7418,7 +7418,8 @@ export class ProfileController extends Controller {
posNo: null, posNo: null,
privacyCheckin: profile.privacyCheckin, privacyCheckin: profile.privacyCheckin,
privacyUser: profile.privacyUser, privacyUser: profile.privacyUser,
privacyMgt : profile.privacyMgt privacyMgt : profile.privacyMgt,
isDeputy: root?.isDeputy ?? false,
// root?.orgRootShortName && posMaster?.posMasterNo // root?.orgRootShortName && posMaster?.posMasterNo
// ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}` // ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
// : "", // : "",
@ -7590,7 +7591,8 @@ export class ProfileController extends Controller {
posNo: null, posNo: null,
privacyCheckin: profile.privacyCheckin, privacyCheckin: profile.privacyCheckin,
privacyUser: profile.privacyUser, privacyUser: profile.privacyUser,
privacyMgt : profile.privacyMgt privacyMgt : profile.privacyMgt,
isDeputy: root?.isDeputy ?? false,
// root?.orgRootShortName && posMaster?.posMasterNo // root?.orgRootShortName && posMaster?.posMasterNo
// ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}` // ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
// : "", // : "",

9
src/controllers/WorkflowController.ts
View file

@ -53,6 +53,7 @@ export class WorkflowController extends Controller {
posLevelName: string; posLevelName: string;
posTypeName: string; posTypeName: string;
fullName?: string | null; fullName?: string | null;
isDeputy?: boolean | null;
}, },
) { ) {
// ขั้นที่ 1: ทำการค้นหา profile และ metaWorkflow แบบ parallel // ขั้นที่ 1: ทำการค้นหา profile และ metaWorkflow แบบ parallel
@ -144,7 +145,13 @@ export class WorkflowController extends Controller {
metaStates.find((metaState) => metaState.id === metaStateOp.metaStateId)?.order === metaStates.find((metaState) => metaState.id === metaStateOp.metaStateId)?.order ===
state.order, state.order,
); );
// Task #2207 กรณีคนขอโอนอยู่ในสำนักปลัดกรุงเทพมหานคร
if (body.isDeputy && metaStateOp.operator == "PersonnelOfficer" && correspondingState?.order == 1) {
return;
}
else if (body.isDeputy && metaStateOp.operator == "Officer" && [1, 2].includes(correspondingState?.order as number)) {
metaStateOp.operator = "PersonnelOfficer"
}
if (correspondingState) { if (correspondingState) {
const stateOperator = new StateOperator(); const stateOperator = new StateOperator();
Object.assign(stateOperator, { Object.assign(stateOperator, {