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

รายชื่อกรรมการ

Browse source
This commit is contained in:
kittapath 2025-01-08 16:25:54 +07:00
parent 3a0fc39397
commit e3275e0b79
1 changed files with 78 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

93
src/controllers/ProfileController.ts
View file

@ -1308,16 +1308,37 @@ export class ProfileController extends Controller {
let condition: any = { let condition: any = {
orgRootId: posMaster.orgRootId || "", orgRootId: posMaster.orgRootId || "",
id: Not(posMaster.current_holderId || ""),
}; };
let conditionNow: any = {
orgRootId: posMaster.orgRootId || "",
orgChild1Id: posMaster.orgChild1Id || "",
orgChild2Id: posMaster.orgChild2Id || "",
orgChild3Id: posMaster.orgChild3Id || "",
orgChild4Id: posMaster.orgChild4Id || "",
id: Not(posMaster.current_holderId || ""),
};
if (posMaster.orgChild2Id == null) {
condition.orgChild1Id = "";
} else if (posMaster.orgChild3Id == null) {
condition.orgChild2Id = "";
} else if (posMaster.orgChild4Id == null) {
condition.orgChild3Id = "";
} else {
condition.orgChild4Id = "";
}
if (body.isDirector == true) { if (body.isDirector == true) {
condition = { condition.isDirector = true;
orgRootId: posMaster.orgRootId || "", conditionNow.isDirector = true;
isDirector: true,
};
} }
const [lists, total] = await AppDataSource.getRepository(viewDirectorActing) const [lists, total] = await AppDataSource.getRepository(viewDirectorActing)
.createQueryBuilder("viewDirectorActing") .createQueryBuilder("viewDirectorActing")
.andWhere(condition) // .andWhere(condition)
.andWhere(
new Brackets((qb) => {
qb.orWhere(condition).orWhere(conditionNow);
}),
)
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.orWhere( qb.orWhere(
@ -1402,16 +1423,37 @@ export class ProfileController extends Controller {
let condition: any = { let condition: any = {
orgRootId: posMaster.orgRootId || "", orgRootId: posMaster.orgRootId || "",
id: Not(posMaster.current_holderId || ""),
}; };
// if (body.isDirector == true) { let conditionNow: any = {
condition = {
orgRootId: posMaster.orgRootId || "", orgRootId: posMaster.orgRootId || "",
isDirector: true, orgChild1Id: posMaster.orgChild1Id || "",
orgChild2Id: posMaster.orgChild2Id || "",
orgChild3Id: posMaster.orgChild3Id || "",
orgChild4Id: posMaster.orgChild4Id || "",
id: Not(posMaster.current_holderId || ""),
}; };
// } if (posMaster.orgChild2Id == null) {
condition.orgChild1Id = "";
} else if (posMaster.orgChild3Id == null) {
condition.orgChild2Id = "";
} else if (posMaster.orgChild4Id == null) {
condition.orgChild3Id = "";
} else {
condition.orgChild4Id = "";
}
if (body.isDirector == true) {
condition.isDirector = true;
conditionNow.isDirector = true;
}
const [lists, total] = await AppDataSource.getRepository(viewDirectorActing) const [lists, total] = await AppDataSource.getRepository(viewDirectorActing)
.createQueryBuilder("viewDirectorActing") .createQueryBuilder("viewDirectorActing")
.andWhere(condition) // .andWhere(condition)
.andWhere(
new Brackets((qb) => {
qb.orWhere(condition).orWhere(conditionNow);
}),
)
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.orWhere( qb.orWhere(
@ -1471,16 +1513,37 @@ export class ProfileController extends Controller {
let condition: any = { let condition: any = {
orgRootId: posMaster.orgRootId || "", orgRootId: posMaster.orgRootId || "",
id: Not(posMaster.current_holderId || ""),
}; };
let conditionNow: any = {
orgRootId: posMaster.orgRootId || "",
orgChild1Id: posMaster.orgChild1Id || "",
orgChild2Id: posMaster.orgChild2Id || "",
orgChild3Id: posMaster.orgChild3Id || "",
orgChild4Id: posMaster.orgChild4Id || "",
id: Not(posMaster.current_holderId || ""),
};
if (posMaster.orgChild2Id == null) {
condition.orgChild1Id = "";
} else if (posMaster.orgChild3Id == null) {
condition.orgChild2Id = "";
} else if (posMaster.orgChild4Id == null) {
condition.orgChild3Id = "";
} else {
condition.orgChild4Id = "";
}
if (body.isDirector == true) { if (body.isDirector == true) {
condition = { condition.isDirector = true;
orgRootId: posMaster.orgRootId || "", conditionNow.isDirector = true;
isDirector: true,
};
} }
const [lists, total] = await AppDataSource.getRepository(viewDirector) const [lists, total] = await AppDataSource.getRepository(viewDirector)
.createQueryBuilder("viewDirector") .createQueryBuilder("viewDirector")
.andWhere(condition) // .andWhere(condition)
.andWhere(
new Brackets((qb) => {
qb.orWhere(condition).orWhere(conditionNow);
}),
)
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.orWhere( qb.orWhere(