From 442be8bf38628fa7211809792e886b1956fbfafe Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Thu, 29 Feb 2024 14:41:44 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=A7=E0=B9=88=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87=E0=B9=84=E0=B8=94=E0=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/SalaryPeriodController.ts | 1 +
 src/entities/SalaryProfile.ts             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index d30628f..346c32c 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -527,6 +527,7 @@ export class SalaryPeriodController extends Controller {
     const salaryOrgAll = await this.salaryOrgRepository.find({
       where: {
         salaryPeriodId: salaryOrg.salaryPeriodId,
+        snapshot: salaryOrg.snapshot,
       },
     });
     if (!salaryOrgAll) {
diff --git a/src/entities/SalaryProfile.ts b/src/entities/SalaryProfile.ts
index badbaba..9c2377a 100644
--- a/src/entities/SalaryProfile.ts
+++ b/src/entities/SalaryProfile.ts
@@ -322,7 +322,7 @@ export class CreateSalaryProfile {
   posExecutive: string | null;
 
   @Column()
-  amount: number;
+  amount: number | null;
 
   @Column("uuid")
   rootId: string | null;