diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index c08f37a..cf5d3b1 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -1177,15 +1177,18 @@ export class DevelopmentController extends Controller { // const before = structuredClone(development); await Promise.all( requestBody.developmentAddresss.map(async (x) => { - if (x.provinceId == "") - throw new HttpError(HttpStatusCode.BAD_REQUEST, "กรุณาเลือกจังหวัด"); + let _null: any = null; const data = Object.assign(new DevelopmentAddress(), x); - const chkProvince = await this.provinceRepository.findOne({ - where: { - id: x.provinceId, - }, - }); - if (chkProvince == null) return; + if (x.provinceId != null) { + const chkProvince = await this.provinceRepository.findOne({ + where: { + id: x.provinceId, + }, + }); + if (chkProvince == null) { + data.provinceId = _null; + } + } data.developmentId = development.id; data.createdUserId = request.user.sub; data.createdFullName = request.user.name; @@ -1247,8 +1250,12 @@ export class DevelopmentController extends Controller { if (!development) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงการ/หลักสูตรการฝึกอบรมนี้"); } + console.log(">>>>>>>>>>", requestBody.results); + let results:any = requestBody.results && requestBody.results != ""?requestBody.results:null; const before = structuredClone(development); const data = Object.assign(new DevelopmentEvaluation(), requestBody); + data.results = results; + data.createdUserId = request.user.sub; data.createdUserId = request.user.sub; data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; diff --git a/src/entities/DevelopmentEvaluation.ts b/src/entities/DevelopmentEvaluation.ts index 0e4a4c4..6dff8d6 100644 --- a/src/entities/DevelopmentEvaluation.ts +++ b/src/entities/DevelopmentEvaluation.ts @@ -82,7 +82,7 @@ export class CreateDevelopmentEvaluation { @Column() measuRement: string | null; @Column() - results: string | null; + results?: string | null; @Column() obstacles: string | null; @Column()