Merge branch 'adiDev' into develop

src/controllers/ProfileLeaveController.ts

@@ -133,7 +133,10 @@ export class ProfileLeaveController extends Controller {
       await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId);
     const record = await this.leaveRepo.find({
       relations: { leaveType: true },
-      where: { profileId: profileId, status: Not("cancel") },
+      where: { 
+        profileId: profileId, 
+        // status: Not("cancel") 
+      },
       order: { createdAt: "ASC" },
     });
     return new HttpSuccess(record);