From 55d1a7163229c46251ec93bffd9f1cd8cb7c2370 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Fri, 8 Nov 2024 10:42:04 +0700 Subject: [PATCH] fix delete kpi plan --- src/controllers/KpiPlanController.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/controllers/KpiPlanController.ts b/src/controllers/KpiPlanController.ts index 630c476..87dcf68 100644 --- a/src/controllers/KpiPlanController.ts +++ b/src/controllers/KpiPlanController.ts @@ -27,6 +27,7 @@ import { KpiRole } from "../entities/kpiRole"; import permission from "../interfaces/permission"; import { RequestWithUser } from "../middlewares/user"; import { setLogDataDiff } from "../interfaces/utils"; +import { KpiUserPlanned } from "../entities/kpiUserPlanned"; @Route("api/v1/kpi/plan") @Tags("kpiPlan") @@ -39,6 +40,7 @@ import { setLogDataDiff } from "../interfaces/utils"; export class kpiPlanController extends Controller { private kpiPlanRepository = AppDataSource.getRepository(KpiPlan); private kpiRoleRepository = AppDataSource.getRepository(KpiRole); + private kpiUserPlanRepository = AppDataSource.getRepository(KpiUserPlanned); private kpiSpecialRepository = AppDataSource.getRepository(KpiSpecial); private kpiPlanHistoryRepository = AppDataSource.getRepository(KpiPlanHistory); private kpiPeriodRepository = AppDataSource.getRepository(KpiPeriod); @@ -866,9 +868,12 @@ export class kpiPlanController extends Controller { } else if (kpiPlan.child4Id != null) { type = 4; } - await this.kpiPlanHistoryRepository.delete({ kpiPlanId: id }); - await this.kpiPlanRepository.remove(kpiPlan, { data: request }); + const _null:any = null; + await this.kpiPlanHistoryRepository.delete({ kpiPlanId: id }); + await this.kpiUserPlanRepository.update({ kpiPlanId: id },{ kpiPlanId: _null }); + await this.kpiPlanRepository.remove(kpiPlan, { data: request }); + if (kpiPlan) { let remainingKpiPlans: any; if (type == 0) {