Merge branch 'develop' into adiDev

2025-01-10 13:57:08 +07:00 · 2025-01-10 13:57:08 +07:00 · bd1d275d9c
commit bd1d275d9c
parent 11015df0a8 7020908d66
1 changed files with 3 additions and 2 deletions
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@ -6890,12 +6890,13 @@ export class ReportController extends Controller {
          qb.orWhere({
            salaryOrgId: In(salaryOrgs.map((x) => x.id)),
            amountSpecial: MoreThan(0),
+            type: Not("NONE"),
            status: "PENDING",
-          }).orWhere({
+          })/*.orWhere({
            salaryOrgId: In(salaryOrgs.map((x) => x.id)),
            type: "NONE",
            status: "PENDING",
-          });
+          });*/
        }),
      )
      .andWhere(