From a82fbcd17e2c8c755c5db55d4533644f97552b3c Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 19 Mar 2024 11:31:21 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6?= =?UTF-8?q?=E0=B8=81=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99?= =?UTF-8?q?=E0=B8=82=E0=B8=B1=E0=B9=89=E0=B8=99=E0=B9=80=E0=B8=87=E0=B8=B4?= =?UTF-8?q?=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=A5?= =?UTF-8?q?=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/SalaryPeriodEmployeeController.ts | 4 ++-- src/entities/SalaryProfileEmployee.ts | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/controllers/SalaryPeriodEmployeeController.ts b/src/controllers/SalaryPeriodEmployeeController.ts index 1d2174c..985ecd4 100644 --- a/src/controllers/SalaryPeriodEmployeeController.ts +++ b/src/controllers/SalaryPeriodEmployeeController.ts @@ -565,8 +565,8 @@ export class SalaryPeriodEmployeeController extends Controller { // if (!salarys) { // throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบระดับตำแหน่ง"); // } - // salaryProfile.type = body.type; - // salaryProfile.isReserve = body.isReserve; + salaryProfile.type = body.type; + salaryProfile.isReserve = body.isReserve; // let type = salaryProfile.type; // //SalaryRank // let salaryRanks: any = null; diff --git a/src/entities/SalaryProfileEmployee.ts b/src/entities/SalaryProfileEmployee.ts index 797840f..cf35700 100644 --- a/src/entities/SalaryProfileEmployee.ts +++ b/src/entities/SalaryProfileEmployee.ts @@ -341,10 +341,13 @@ export class CreateSalaryProfileEmployee { position: string; @Column() - posType: string; + posType: string | null; @Column() - posLevel: string; + posLevel: string | null; + + @Column() + salaryLevel: number | null; // @Column() // posExecutive: string | null;