From f9f0782cb24c56981e1a8226c80a0c4413cb3eb8 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Mon, 29 Jan 2024 11:36:03 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20path=E0=B8=AA?= =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B9=82=E0=B8=84=E0=B8=A3?= =?UTF-8?q?=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/OrganizationController.ts | 75 +++++++++++------------ 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index 994b7b29..3afd7bf6 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -112,7 +112,7 @@ export class OrganizationController extends Controller { * @summary ORG_022 - สร้างโครงสร้างใหม่ #23 (ยังไม่เสร็จ) * */ - @Post() + @Post("draft") async CreateOrgRevision( @Body() requestBody: CreateOrgRevision, @Request() request: { user: Record }, @@ -288,51 +288,48 @@ export class OrganizationController extends Controller { */ @Get("{id}") async detail(@Path() id: string) { - try { - const orgRevisionData = await AppDataSource.getRepository(OrgRevision) - .createQueryBuilder("orgRevision") - // .leftJoin("orgRevision.orgRoots", "orgRoot") - // .leftJoin("orgRoot.orgChild1s", "orgChild1") - // .leftJoin("orgChild1.orgChild2s", "orgChild2") - // .leftJoin("orgChild2.orgChild3s", "orgChild3") - // .leftJoin("orgChild3.orgChild4s", "orgChild4") - .where("orgRevision.id = :id", { id }) - // .select([ - // "orgRoot.id", - // "orgRoot.orgRootName", - // "orgRoot.orgRootShortName", - // "orgRoot.orgRootCode", - // "orgRoot.orgRootOrder", + .createQueryBuilder("orgRevision") + // .leftJoin("orgRevision.orgRoots", "orgRoot") + // .leftJoin("orgRoot.orgChild1s", "orgChild1") + // .leftJoin("orgChild1.orgChild2s", "orgChild2") + // .leftJoin("orgChild2.orgChild3s", "orgChild3") + // .leftJoin("orgChild3.orgChild4s", "orgChild4") + .where("orgRevision.id = :id", { id }) + // .select([ + // "orgRoot.id", + // "orgRoot.orgRootName", + // "orgRoot.orgRootShortName", + // "orgRoot.orgRootCode", + // "orgRoot.orgRootOrder", - // "orgChild1.id", - // "orgChild1.orgChild1Name", - // "orgChild1.orgChild1ShortName", - // "orgChild1.orgChild1Code", - // "orgChild1.orgChild1Order", + // "orgChild1.id", + // "orgChild1.orgChild1Name", + // "orgChild1.orgChild1ShortName", + // "orgChild1.orgChild1Code", + // "orgChild1.orgChild1Order", - // "orgChild2.id", - // "orgChild2.orgChild2Name", - // "orgChild2.orgChild2ShortName", - // "orgChild2.orgChild2Code", - // "orgChild2.orgChild2Order", + // "orgChild2.id", + // "orgChild2.orgChild2Name", + // "orgChild2.orgChild2ShortName", + // "orgChild2.orgChild2Code", + // "orgChild2.orgChild2Order", - // "orgChild3.id", - // "orgChild3.orgChild3Name", - // "orgChild3.orgChild3ShortName", - // "orgChild3.orgChild3Code", - // "orgChild3.orgChild3Order", + // "orgChild3.id", + // "orgChild3.orgChild3Name", + // "orgChild3.orgChild3ShortName", + // "orgChild3.orgChild3Code", + // "orgChild3.orgChild3Order", - // "orgChild4.id", - // "orgChild4.orgChild4Name", - // "orgChild4.orgChild4ShortName", - // "orgChild4.orgChild4Code", - // "orgChild4.orgChild4Order", - // ]) - .getOne(); + // "orgChild4.id", + // "orgChild4.orgChild4Name", + // "orgChild4.orgChild4ShortName", + // "orgChild4.orgChild4Code", + // "orgChild4.orgChild4Order", + // ]) + .getOne(); - return new HttpSuccess(orgRevisionData); } catch (error) { return error;