From 494044773bcd09b419a721cfa531ed01de418cf4 Mon Sep 17 00:00:00 2001 From: kittapath Date: Wed, 11 Sep 2024 09:49:40 +0700 Subject: [PATCH 1/3] =?UTF-8?q?sort=20=E0=B8=AA=E0=B8=B3=E0=B8=99=E0=B8=B1?= =?UTF-8?q?=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/PermissionOrgController.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/controllers/PermissionOrgController.ts b/src/controllers/PermissionOrgController.ts index 4c74a527..1150f6cd 100644 --- a/src/controllers/PermissionOrgController.ts +++ b/src/controllers/PermissionOrgController.ts @@ -60,6 +60,9 @@ export class PermissionOrgController extends Controller { const data = await this.orgRootRepository.find({ where: { orgRevisionId: orgRevisionActive.id }, + order: { + orgRootOrder: "ASC", + }, }); return new HttpSuccess(data); } From 095b7777758a27178e7432d526784766b8b214b4 Mon Sep 17 00:00:00 2001 From: kittapath Date: Wed, 11 Sep 2024 10:03:01 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20api=20?= =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B9=82=E0=B8=84?= =?UTF-8?q?=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=E0=B9=83=E0=B8=AB=E0=B8=A1=E0=B9=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/OrganizationController.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index dcf6dca0..c6c34abc 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -41,6 +41,7 @@ import permission from "../interfaces/permission"; @SuccessResponse(HttpStatusCode.OK, "สำเร็จ") export class OrganizationController extends Controller { private orgRevisionRepository = AppDataSource.getRepository(OrgRevision); + private permissionOrgRepository = AppDataSource.getRepository(PermissionOrg); private orgRootRepository = AppDataSource.getRepository(OrgRoot); private child1Repository = AppDataSource.getRepository(OrgChild1); private child2Repository = AppDataSource.getRepository(OrgChild2); @@ -586,6 +587,9 @@ export class OrganizationController extends Controller { await this.child3Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) }); await this.child2Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) }); await this.child1Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) }); + await this.permissionOrgRepository.delete({ + orgRootId: In(_posMasters.map((x) => x.orgRootId)), + }); await this.orgRootRepository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) }); await this.orgRevisionRepository.remove(_orgRevisions); From 38fb907ac355e2afc72ebf85369b1f2308c5aa12 Mon Sep 17 00:00:00 2001 From: kittapath Date: Wed, 11 Sep 2024 10:11:54 +0700 Subject: [PATCH 3/3] import entity --- src/controllers/OrganizationController.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index c6c34abc..93d73333 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -30,6 +30,7 @@ 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"; @Route("api/v1/org") @Tags("Organization")