From 230e8ea488de1bdfabfc7dcd4f8d9dd41c6085ca Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Mon, 11 Mar 2024 10:45:40 +0700 Subject: [PATCH 1/6] Fix timezone --- src/interfaces/utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/interfaces/utils.ts b/src/interfaces/utils.ts index be350f51..ef23c9b1 100644 --- a/src/interfaces/utils.ts +++ b/src/interfaces/utils.ts @@ -35,7 +35,7 @@ export function calculateRetireDate(birthDate: Date) { break; } - if (flag) return new Date(`${yy + 60}-09-30T00:00:00.000Z`); + if (flag) return new Date(`${yy + 60}-09-30T00:00:00.000+07:00`); - return new Date(`${yy + 61}-09-30T00:00:00.000Z`); + return new Date(`${yy + 61}-09-30T00:00:00.000+07:00`); } From b7c6ef1c048a53538909a6bd1b67bfee4bc0de25 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 11 Mar 2024 11:22:10 +0700 Subject: [PATCH 2/6] fix word --- src/controllers/OrgChild1Controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/OrgChild1Controller.ts b/src/controllers/OrgChild1Controller.ts index da664b33..11af9a82 100644 --- a/src/controllers/OrgChild1Controller.ts +++ b/src/controllers/OrgChild1Controller.ts @@ -124,7 +124,7 @@ export class OrgChild1Controller { }, }); if (chkCode != null) { - throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว"); + throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"); } const order: any = await this.child1Repository.findOne({ where: { From 082ce90dcd075fbd98d972cb97455441470ae2de Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 11 Mar 2024 11:31:38 +0700 Subject: [PATCH 3/6] =?UTF-8?q?fix=20word=20"=E0=B8=A3=E0=B8=AB=E0=B8=B1?= =?UTF-8?q?=E0=B8=AA=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=99=E0=B8=B5=E0=B9=89?= =?UTF-8?q?=E0=B8=A1=E0=B8=B5=E0=B8=AD=E0=B8=A2=E0=B8=B9=E0=B9=88=E0=B9=83?= =?UTF-8?q?=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B9=81=E0=B8=A5?= =?UTF-8?q?=E0=B9=89=E0=B8=A7"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/OrgChild1Controller.ts | 2 +- src/controllers/OrgRootController.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/OrgChild1Controller.ts b/src/controllers/OrgChild1Controller.ts index 11af9a82..bda21a07 100644 --- a/src/controllers/OrgChild1Controller.ts +++ b/src/controllers/OrgChild1Controller.ts @@ -202,7 +202,7 @@ export class OrgChild1Controller { }, }); if (chkCode != null) { - throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว"); + throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"); } child1.lastUpdateUserId = request.user.sub; child1.lastUpdateFullName = request.user.name; diff --git a/src/controllers/OrgRootController.ts b/src/controllers/OrgRootController.ts index 8b11eec0..6cd821d1 100644 --- a/src/controllers/OrgRootController.ts +++ b/src/controllers/OrgRootController.ts @@ -108,7 +108,7 @@ export class OrgRootController extends Controller { where: { orgRevisionId: requestBody.orgRevisionId, orgRootCode: requestBody.orgRootCode }, }); if (chkCode != null) { - throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว"); + throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"); } const orgRevision = await this.orgRevisionRepository.findOne({ @@ -190,7 +190,7 @@ export class OrgRootController extends Controller { where: { orgRevisionId: requestBody.orgRevisionId, orgRootCode: requestBody.orgRootCode }, }); if (chkCode?.id != id && chkCode != null) { - throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว"); + throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"); } const orgRoot = await this.orgRootRepository.findOne({ where: { id } }); From 4da17192f30585d5584c629fdca236ad8df96379 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 11 Mar 2024 11:42:04 +0700 Subject: [PATCH 4/6] fix word --- src/controllers/OrgChild1Controller.ts | 2 +- src/controllers/OrgRootController.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/OrgChild1Controller.ts b/src/controllers/OrgChild1Controller.ts index bda21a07..11af9a82 100644 --- a/src/controllers/OrgChild1Controller.ts +++ b/src/controllers/OrgChild1Controller.ts @@ -202,7 +202,7 @@ export class OrgChild1Controller { }, }); if (chkCode != null) { - throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"); + throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว"); } child1.lastUpdateUserId = request.user.sub; child1.lastUpdateFullName = request.user.name; diff --git a/src/controllers/OrgRootController.ts b/src/controllers/OrgRootController.ts index 6cd821d1..ae46c876 100644 --- a/src/controllers/OrgRootController.ts +++ b/src/controllers/OrgRootController.ts @@ -190,7 +190,7 @@ export class OrgRootController extends Controller { where: { orgRevisionId: requestBody.orgRevisionId, orgRootCode: requestBody.orgRootCode }, }); if (chkCode?.id != id && chkCode != null) { - throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"); + throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว"); } const orgRoot = await this.orgRootRepository.findOne({ where: { id } }); From 91e6665a50cd233232db2a6688ac6a6af3e1de42 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 11 Mar 2024 11:49:38 +0700 Subject: [PATCH 5/6] fix --- src/controllers/OrgRootController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/OrgRootController.ts b/src/controllers/OrgRootController.ts index ae46c876..8b11eec0 100644 --- a/src/controllers/OrgRootController.ts +++ b/src/controllers/OrgRootController.ts @@ -108,7 +108,7 @@ export class OrgRootController extends Controller { where: { orgRevisionId: requestBody.orgRevisionId, orgRootCode: requestBody.orgRootCode }, }); if (chkCode != null) { - throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"); + throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว"); } const orgRevision = await this.orgRevisionRepository.findOne({ From a98ac715adcc9e251545813fa38523902a3c0015 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 11 Mar 2024 12:01:04 +0700 Subject: [PATCH 6/6] fix --- src/controllers/OrgChild1Controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/OrgChild1Controller.ts b/src/controllers/OrgChild1Controller.ts index 11af9a82..bda21a07 100644 --- a/src/controllers/OrgChild1Controller.ts +++ b/src/controllers/OrgChild1Controller.ts @@ -202,7 +202,7 @@ export class OrgChild1Controller { }, }); if (chkCode != null) { - throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว"); + throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"); } child1.lastUpdateUserId = request.user.sub; child1.lastUpdateFullName = request.user.name;