diff --git a/src/controllers/WorkflowController.ts b/src/controllers/WorkflowController.ts index 77ca0481..ce6eb50b 100644 --- a/src/controllers/WorkflowController.ts +++ b/src/controllers/WorkflowController.ts @@ -627,6 +627,9 @@ export class WorkflowController extends Controller { }); if (!state) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลขั้นตอนการอนุมัติ"); + if (state.stateUserComments.filter((x) => x.profileId == body.profileId).length > 0) + throw new HttpError(HttpStatus.NOT_FOUND, "มีผู้ใช้งานนี้อยู่แล้ว"); + const stateUserComment = new StateUserComment(); stateUserComment.order = state.stateUserComments.length + 1; stateUserComment.stateId = body.stateId; @@ -907,14 +910,16 @@ export class WorkflowController extends Controller { { keyword: `%${body.keyword}%`, }, - ).orWhere( + ) + .orWhere( body.keyword != null && body.keyword != "" ? "viewDirectorActing.posNo LIKE :keyword" : "1=1", { keyword: `%${body.keyword}%`, }, - ).orWhere( + ) + .orWhere( body.keyword != null && body.keyword != "" ? "viewDirectorActing.posExecutiveName LIKE :keyword" : "1=1", @@ -973,14 +978,16 @@ export class WorkflowController extends Controller { { keyword: `%${body.keyword}%`, }, - ).orWhere( + ) + .orWhere( body.keyword != null && body.keyword != "" ? "viewDirector.posNo LIKE :keyword" : "1=1", { keyword: `%${body.keyword}%`, }, - ).orWhere( + ) + .orWhere( body.keyword != null && body.keyword != "" ? "viewDirector.posExecutiveName LIKE :keyword" : "1=1",