From 5530c36f93b240f64c1eb07b7736ee82af085234 Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 14 Nov 2024 14:58:31 +0700 Subject: [PATCH] no message --- src/controllers/OrganizationController.ts | 11 +++------- .../OrganizationUnauthorizeController.ts | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index cc0f2139..bb02da93 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -24,14 +24,12 @@ import { OrgChild3 } from "../entities/OrgChild3"; import { OrgChild4 } from "../entities/OrgChild4"; import { PosMaster } from "../entities/PosMaster"; import { Position } from "../entities/Position"; -import { ProfileSalary } from "../entities/ProfileSalary"; import { Profile } from "../entities/Profile"; import { RequestWithUser } from "../middlewares/user"; import permission from "../interfaces/permission"; import { PermissionOrg } from "../entities/PermissionOrg"; import { setLogDataDiff } from "../interfaces/utils"; -import { AuthRole } from "../entities/AuthRole"; -import { sendToQueue, sendToQueueOrg } from "../services/rabbitmq"; +import { sendToQueueOrg } from "../services/rabbitmq"; @Route("api/v1/org") @Tags("Organization") @@ -676,13 +674,10 @@ export class OrganizationController extends Controller { * @param {string} id Id OrgRevison */ @Get("lock/{id}") - async GetById( - @Request() request: RequestWithUser, - @Path() id: string, - ) { + async GetById(@Request() request: RequestWithUser, @Path() id: string) { //add check permission const orgRevision = await this.orgRevisionRepository.findOne({ - where: { id: id } + where: { id: id }, }); if (!orgRevision) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงสร้าง"); diff --git a/src/controllers/OrganizationUnauthorizeController.ts b/src/controllers/OrganizationUnauthorizeController.ts index e2c963fa..234e4c6d 100644 --- a/src/controllers/OrganizationUnauthorizeController.ts +++ b/src/controllers/OrganizationUnauthorizeController.ts @@ -942,4 +942,25 @@ export class OrganizationUnauthorizeController extends Controller { if (val >= 90 && val <= 100) return "ดีเด่น"; else return "-"; } + + /** + * API หาสำนักทั้งหมด + * + * @summary หาสำนักทั้งหมด + * + */ + @Get("active/root/all") + async GetActiveRootAll() { + const orgRevisionActive = await this.orgRevisionRepository.findOne({ + where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false }, + }); + if (!orgRevisionActive) { + throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบโครงสร้างที่เผยแพร่อยู่ตอนนี้"); + } + + const data = await this.orgRootRepository.find({ + where: { orgRevisionId: orgRevisionActive.id }, + }); + return new HttpSuccess(data); + } }