Merge branch 'develop' into adiDev

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")
@@ -41,6 +42,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 +588,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);
 

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);
   }