From 5ef3c3e41738399286c8babe5576001e8a4eea6d Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 8 Mar 2024 11:38:27 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/SalaryPeriodController.ts | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index 71ae350..f01c562 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -1384,15 +1384,17 @@ export class SalaryPeriodController extends Controller { salaryOrgNew.rootId = rootId; salaryOrgNew.revisionId = salaryPeriod.revisionId; salaryOrgNew.snapshot = snapshot; - salaryOrgNew.group = "GROUP1"; salaryOrgNew.createdUserId = request.user.sub; salaryOrgNew.createdFullName = request.user.name; salaryOrgNew.lastUpdateUserId = request.user.sub; salaryOrgNew.lastUpdateFullName = request.user.name; + salaryOrgNew.group = "GROUP1"; await this.salaryOrgRepository.save(salaryOrgNew); - delete salaryOrgNew.id; - salaryOrgNew.group = "GROUP2"; - await this.salaryOrgRepository.save(salaryOrgNew); + if (salaryPeriod.period != "SPECIAL") { + delete salaryOrgNew.id; + salaryOrgNew.group = "GROUP2"; + await this.salaryOrgRepository.save(salaryOrgNew); + } }), ); if (salaryPeriod.period != "SPECIAL") { @@ -1667,15 +1669,17 @@ export class SalaryPeriodController extends Controller { salaryOrgNew.rootId = rootId; salaryOrgNew.revisionId = salaryPeriod.revisionId; salaryOrgNew.snapshot = snapshot; - salaryOrgNew.group = "GROUP1"; salaryOrgNew.createdUserId = request.user.sub; salaryOrgNew.createdFullName = request.user.name; salaryOrgNew.lastUpdateUserId = request.user.sub; salaryOrgNew.lastUpdateFullName = request.user.name; + salaryOrgNew.group = "GROUP1"; await this.salaryOrgRepository.save(salaryOrgNew); - delete salaryOrgNew.id; - salaryOrgNew.group = "GROUP2"; - await this.salaryOrgRepository.save(salaryOrgNew); + if (salaryPeriod.period != "SPECIAL") { + delete salaryOrgNew.id; + salaryOrgNew.group = "GROUP2"; + await this.salaryOrgRepository.save(salaryOrgNew); + } }), );