From 50776ec3e61b216cdee9f0b7cde6750474bd372c Mon Sep 17 00:00:00 2001 From: Kittapath Date: Wed, 17 Jul 2024 17:15:39 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=20check=20box?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KpiUserDevelopmentController.ts | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/controllers/KpiUserDevelopmentController.ts b/src/controllers/KpiUserDevelopmentController.ts index cc67cf4..0dadbc5 100644 --- a/src/controllers/KpiUserDevelopmentController.ts +++ b/src/controllers/KpiUserDevelopmentController.ts @@ -133,21 +133,6 @@ export class KpiUserDevelopmentController extends Controller { if (!kpiUserDevelopment) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลพัฒนาตนเองนี้"); } - await this.developmentProjectRepository.remove(kpiUserDevelopment.developmentProjects); - if (requestBody.developmentProjects != null) { - await Promise.all( - requestBody.developmentProjects.map(async (x) => { - let data = new DevelopmentProject(); - data.name = x; - data.createdUserId = request.user.sub; - data.createdFullName = request.user.name; - data.lastUpdateUserId = request.user.sub; - data.lastUpdateFullName = request.user.name; - data.kpiUserDevelopmentId = kpiUserDevelopment.id; - this.developmentProjectRepository.save(data); - }), - ); - } const chkUserEvaluation = await this.kpiUserEvaluationRepository.findOne({ where: { id: requestBody.kpiUserEvaluationId }, }); @@ -180,11 +165,26 @@ export class KpiUserDevelopmentController extends Controller { // "ไม่สามารถเพิ่มข้อมูลได้เนื่องจากข้อมูลตัวชี้วัดซ้ำ", // ); // } + await this.developmentProjectRepository.remove(kpiUserDevelopment.developmentProjects); kpiUserDevelopment.lastUpdateUserId = request.user.sub; kpiUserDevelopment.lastUpdateFullName = request.user.name; Object.assign(kpiUserDevelopment, requestBody); await this.kpiUserDevelopmentRepository.save(kpiUserDevelopment); + if (requestBody.developmentProjects != null) { + await Promise.all( + requestBody.developmentProjects.map(async (x) => { + let data = new DevelopmentProject(); + data.name = x; + data.createdUserId = request.user.sub; + data.createdFullName = request.user.name; + data.lastUpdateUserId = request.user.sub; + data.lastUpdateFullName = request.user.name; + data.kpiUserDevelopmentId = kpiUserDevelopment.id; + await this.developmentProjectRepository.save(data); + }), + ); + } return new HttpSuccess(kpiUserDevelopment.id); }