hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

ปิดออกคำสั่ง fix root salary/gen

Browse source
This commit is contained in:
AdisakKanthawilang 2025-05-01 10:19:19 +07:00
parent e95a299ab2
commit 5ac856fb18
2 changed files with 175 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/controllers/OrganizationUnauthorizeController.ts
View file

@ -317,10 +317,19 @@ export class OrganizationUnauthorizeController extends Controller {
if (!findRevision) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. OrgRevision");
}
const rootIds = [
"d7e98989-b5ce-47d6-93c3-ab63ed486348",
"e0545eca-5d0a-4a1c-8bbd-e3e25c2521db",
"7ff1fbf2-cc9e-4f53-b83c-334967c27967",
"26989ffa-d5ab-4bbd-ac97-130646cd1da6",
"6f9b30e1-757a-40d5-b053-61eb1b91c0f0",
"eaf65f33-25e9-4956-9dba-5d909f5eb595",
];
const [findPosMaster, total] = await AppDataSource.getRepository(viewPosMaster)
.createQueryBuilder("viewPosMaster")
.where({orgRevisionId: findRevision?.id})
.andWhere("viewPosMaster.rootId IN (:...rootIds)", { rootIds })
.andWhere(
new Brackets((qb) => {
qb.where(
@ -744,11 +753,21 @@ export class OrganizationUnauthorizeController extends Controller {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. OrgRevision");
}
const rootIds = [
"d7e98989-b5ce-47d6-93c3-ab63ed486348",
"e0545eca-5d0a-4a1c-8bbd-e3e25c2521db",
"7ff1fbf2-cc9e-4f53-b83c-334967c27967",
"26989ffa-d5ab-4bbd-ac97-130646cd1da6",
"6f9b30e1-757a-40d5-b053-61eb1b91c0f0",
"eaf65f33-25e9-4956-9dba-5d909f5eb595",
];
const [findPosMaster, total] = await AppDataSource.getRepository(viewEmployeePosMaster)
.createQueryBuilder("viewEmployeePosMaster")
.where({
orgRevisionId: findRevision?.id,
})
.andWhere("viewEmployeePosMaster.rootId IN (:...rootIds)", { rootIds })
.andWhere(
new Brackets((qb) => {
qb.where(