From 8bb7a9c526812a0db7c916d5f82830d058e216a2 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 6 Sep 2024 17:34:54 +0700 Subject: [PATCH] fixing data report --- src/controllers/EvaluateResultController.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/controllers/EvaluateResultController.ts b/src/controllers/EvaluateResultController.ts index 1aee787..c740f2e 100644 --- a/src/controllers/EvaluateResultController.ts +++ b/src/controllers/EvaluateResultController.ts @@ -220,7 +220,7 @@ export class EvaluateResultController extends Controller { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลแบบมอบหมายงาน"); } - const experimenteeData = await this.personalRepository.find({ + const experimenteeData = await this.personalRepository.findOne({ select: [ "personal_id", "prefixName", @@ -233,11 +233,15 @@ export class EvaluateResultController extends Controller { where: { personal_id: assign.personal_id }, }); - const experimentee = await experimenteeData.map((element) => ({ - ...element, - name: element.prefixName + element.firstName + " " + element.lastName, - Oc: element.organization, - })); + if (!experimenteeData) { + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล"); + } + const experimentee = await { + ...experimenteeData, + name: + experimenteeData.prefixName + experimenteeData.firstName + " " + experimenteeData.lastName, + Oc: experimenteeData.organization, + }; const directorData = await this.assignDirectorRepository.find({ where: { assign_id },