Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

2024-11-07 10:52:01 +07:00 · 2024-11-07 10:52:01 +07:00 · 19c332af57
commit 19c332af57
parent 6d50bd3b2f dd05bb1e41
2 changed files with 2 additions and 0 deletions
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@ -3952,6 +3952,7 @@ export class ProfileController extends Controller {
          position: `%${requestBody.position}%`,
        },
      )
+      .andWhere("profile.isLeave IS FALSE")
      .andWhere(
        new Brackets((qb) => {
          qb.where(
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@ -1681,6 +1681,7 @@ export class ProfileEmployeeController extends Controller {
          position: `%${requestBody.position}%`,
        },
      )
+      .andWhere("profileEmployee.isLeave IS FALSE")
      .andWhere(
        new Brackets((qb) => {
          qb.where(