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

no message

Browse source
This commit is contained in:
kittapath 2024-10-22 14:56:14 +07:00
parent 08ca03f733
commit 77d68e7096
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/WorkflowController.ts
View file

@ -756,7 +756,12 @@ export class WorkflowController extends Controller {
actFullName: null,
}));
const posMasterActs = await this.posMasterActRepo.find({
where: { posMasterId: In(posMasters.map((x) => x.id)) },
where: {
posMasterId: In(posMasters.map((x) => x.id)),
posMasterChild: {
current_holderId: Not(In(posMasters.map((x) => x.current_holderId))),
},
},
relations: [
"posMaster",
"posMaster.current_holder",
@ -770,7 +775,7 @@ export class WorkflowController extends Controller {
});
posMasterActs.map((x) => {
let item: any = {
id: x.posMaster?.current_holderId || null,
id: x.posMasterChild?.current_holderId || null,
prefix: x.posMasterChild?.current_holder?.prefix || "",
firstName: x.posMasterChild?.current_holder?.firstName || "",
lastName: x.posMasterChild?.current_holder?.lastName || "",