diff --git a/src/controllers/KpiUserRoleController.ts b/src/controllers/KpiUserRoleController.ts index 5ebae79..c0cb331 100644 --- a/src/controllers/KpiUserRoleController.ts +++ b/src/controllers/KpiUserRoleController.ts @@ -94,14 +94,6 @@ export class KpiUserRoleController extends Controller { kpiUserRole.createdFullName = request.user.name; kpiUserRole.lastUpdateUserId = request.user.sub; kpiUserRole.lastUpdateFullName = request.user.name; - kpiUserRole.documentInfoEvidence = request.user.documentInfoEvidence; - kpiUserRole.startDate = request.user.startDate; - kpiUserRole.endDate = request.user.endDate; - kpiUserRole.achievement1 = request.user.achievement1; - kpiUserRole.achievement2 = request.user.achievement2; - kpiUserRole.achievement3 = request.user.achievement3; - kpiUserRole.achievement4 = request.user.achievement4; - kpiUserRole.achievement5 = request.user.achievement5; await this.kpiUserRoleRepository.save(kpiUserRole); return new HttpSuccess(kpiUserRole.id); } @@ -156,14 +148,6 @@ export class KpiUserRoleController extends Controller { kpiUserRole.lastUpdateUserId = request.user.sub; kpiUserRole.lastUpdateFullName = request.user.name; - kpiUserRole.documentInfoEvidence = request.user.documentInfoEvidence; - kpiUserRole.startDate = request.user.startDate; - kpiUserRole.endDate = request.user.endDate; - kpiUserRole.achievement1 = request.user.achievement1; - kpiUserRole.achievement2 = request.user.achievement2; - kpiUserRole.achievement3 = request.user.achievement3; - kpiUserRole.achievement4 = request.user.achievement4; - kpiUserRole.achievement5 = request.user.achievement5; this.kpiUserRoleRepository.merge(kpiUserRole, requestBody); await this.kpiUserRoleRepository.save(kpiUserRole); return new HttpSuccess(kpiUserRole.id); diff --git a/src/controllers/KpiUserSpecialController.ts b/src/controllers/KpiUserSpecialController.ts index e613b30..b66fadd 100644 --- a/src/controllers/KpiUserSpecialController.ts +++ b/src/controllers/KpiUserSpecialController.ts @@ -84,13 +84,13 @@ export class KpiUserSpecialController extends Controller { "ไม่สามารถเพิ่มข้อมูลได้เนื่องจากข้อมูลตัวชี้วัดซ้ำ", ); } - const chk_kpiSpecial = await this.kpiSpecialRepository.findOne({ + const chk_kpiSpecial = await this.kpiSpecialRepository.findOne({ where: { including: String(requestBody.including), - includingName: String(requestBody.includingName) + includingName: String(requestBody.includingName), }, }); - if(!chk_kpiSpecial){ + if (!chk_kpiSpecial) { const kpiSpecial = Object.assign(new KpiSpecial(), requestBody); if (!kpiSpecial) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); @@ -105,9 +105,6 @@ export class KpiUserSpecialController extends Controller { kpiUserSpecial.createdFullName = request.user.name; kpiUserSpecial.lastUpdateUserId = request.user.sub; kpiUserSpecial.lastUpdateFullName = request.user.name; - kpiUserSpecial.documentInfoEvidence = request.user.documentInfoEvidence; - kpiUserSpecial.startDate = request.user.startDate; - kpiUserSpecial.endDate = request.user.endDate; await this.kpiUserSpecialRepository.save(kpiUserSpecial); return new HttpSuccess(kpiUserSpecial.id); } @@ -156,13 +153,13 @@ export class KpiUserSpecialController extends Controller { "ไม่สามารถเพิ่มข้อมูลได้เนื่องจากข้อมูลตัวชี้วัดซ้ำ", ); } - const chk_kpiSpecial = await this.kpiSpecialRepository.findOne({ + const chk_kpiSpecial = await this.kpiSpecialRepository.findOne({ where: { including: String(requestBody.including), - includingName: String(requestBody.includingName) + includingName: String(requestBody.includingName), }, }); - if(!chk_kpiSpecial){ + if (!chk_kpiSpecial) { const kpiSpecial = Object.assign(new KpiSpecial(), requestBody); if (!kpiSpecial) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); @@ -175,9 +172,6 @@ export class KpiUserSpecialController extends Controller { } kpiUserSpecial.lastUpdateUserId = request.user.sub; kpiUserSpecial.lastUpdateFullName = request.user.name; - kpiUserSpecial.documentInfoEvidence = request.user.documentInfoEvidence; - kpiUserSpecial.startDate = request.user.startDate; - kpiUserSpecial.endDate = request.user.endDate; Object.assign(kpiUserSpecial, requestBody); await this.kpiUserSpecialRepository.save(kpiUserSpecial); return new HttpSuccess(kpiUserSpecial.id);