From 9121eebcdea938c618966c516606c35073402615 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 18 Jul 2025 14:40:50 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=96=E0=B8=B6=E0=B8=87=E0=B9=81=E0=B8=81?= =?UTF-8?q?=E0=B9=88=E0=B8=81=E0=B8=A3=E0=B8=A3=E0=B8=A1=E0=B8=9B=E0=B8=B1?= =?UTF-8?q?=E0=B9=8A=E0=B8=A1=E0=B8=A5=E0=B8=87=20leaveDate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 1 + src/controllers/ProfileEmployeeController.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 9bdb33ff..22abc1de 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -10297,6 +10297,7 @@ export class ProfileController extends Controller { profile.isLeave = requestBody.isLeave; profile.leaveReason = requestBody.leaveReason; profile.dateLeave = requestBody.dateLeave; + profile.leaveDate = requestBody.dateLeave; profile.leaveType = "RETIRE_DECEASED"; // profile.position = _null; // profile.posLevelId = _null; diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 9331c1a2..00a04ca2 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -5702,6 +5702,8 @@ export class ProfileEmployeeController extends Controller { profile.isLeave = requestBody.isLeave; profile.leaveReason = requestBody.leaveReason; profile.dateLeave = requestBody.dateLeave; + profile.leaveDate = requestBody.dateLeave; + profile.leaveType = "RETIRE_DECEASED"; // profile.position = _null; // profile.posLevelId = _null; // profile.posTypeId = _null; @@ -5713,7 +5715,6 @@ export class ProfileEmployeeController extends Controller { profile.isActive = false; } } - profile.leaveType = "RETIRE_DECEASED"; await this.profileRepo.save(profile); if (requestBody.isLeave == true) { await removeProfileInOrganize(profile.id, "EMPLOYEE");