From 5947b19f9efbc787714f0f8532eafba70ce18595 Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 17 Oct 2024 12:10:23 +0700 Subject: [PATCH] check state --- src/controllers/WorkflowController.ts | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/controllers/WorkflowController.ts b/src/controllers/WorkflowController.ts index c8757430..c249ca64 100644 --- a/src/controllers/WorkflowController.ts +++ b/src/controllers/WorkflowController.ts @@ -265,8 +265,6 @@ export class WorkflowController extends Controller { }); if (!stateOperatorUser) throw new HttpError(HttpStatus.NOT_FOUND, "ผู้ใช้งานนี้ไม่มีหน้าที่ในกระบวนการนี้"); - console.log(stateOperatorUser.operator); - console.log(stateOperatorUser.workflow.stateId); const operator = await this.stateOperatorRepo.findOne({ where: { operator: stateOperatorUser.operator, @@ -274,8 +272,25 @@ export class WorkflowController extends Controller { }, relations: ["state"], }); - if (!operator) - throw new HttpError(HttpStatus.NOT_FOUND, "ผู้ใช้งานนี้ไม่มีหน้าที่ในขั้นตอนนี้"); + if (!operator) { + const state = await this.stateRepo.findOne({ + where: { + id: stateOperatorUser.workflow.stateId, + }, + }); + return new HttpSuccess({ + stateId: state?.id || null, + stateNo: state?.order || null, + stateName: state?.name || null, + operator: stateOperatorUser.operator, + can_view: false, + can_update: false, + can_operate: false, + can_change_state: false, + can_delete: false, + can_cancel: false, + }); + } return new HttpSuccess({ stateId: operator.state.id, stateNo: operator.state.order,