This commit is contained in:
parent
ee2221b719
commit
54a96ac7c9
1 changed files with 24 additions and 4 deletions
|
|
@ -532,7 +532,17 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
? x.id
|
||||
: x.ancestorDNA,
|
||||
}));
|
||||
await repoEmployeePosmaster.save(_orgemployeePosMaster);
|
||||
// await repoEmployeePosmaster.save(_orgemployeePosMaster);
|
||||
await repoEmployeePosmaster
|
||||
.createQueryBuilder()
|
||||
.insert()
|
||||
.into(EmployeePosMaster)
|
||||
.values(_orgemployeePosMaster)
|
||||
.orUpdate({
|
||||
conflict_target: ['id'],
|
||||
overwrite: ['ancestorDNA'],
|
||||
})
|
||||
.execute();
|
||||
|
||||
// }
|
||||
//หา dna posmaster ถ้าไม่มีให้เอาตัวเองเป็น dna
|
||||
|
|
@ -555,9 +565,19 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
? x.id
|
||||
: x.ancestorDNA,
|
||||
}));
|
||||
await repoEmployeeTempPosmaster.save(_orgemployeeTempPosMaster);
|
||||
// await repoEmployeeTempPosmaster.save(_orgemployeeTempPosMaster);
|
||||
await repoEmployeeTempPosmaster
|
||||
.createQueryBuilder()
|
||||
.insert()
|
||||
.into(EmployeeTempPosMaster)
|
||||
.values(_orgemployeeTempPosMaster)
|
||||
.orUpdate({
|
||||
conflict_target: ['id'],
|
||||
overwrite: ['ancestorDNA'],
|
||||
})
|
||||
.execute();
|
||||
// }
|
||||
|
||||
|
||||
//create org
|
||||
orgRoot.forEach(async (x: any) => {
|
||||
var dataId = x.id;
|
||||
|
|
@ -1364,7 +1384,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
});
|
||||
});
|
||||
// }
|
||||
|
||||
|
||||
const employeePosMaster = await repoEmployeePosmaster.find({
|
||||
where: { orgRevisionId: orgRevisionDraft.id },
|
||||
relations: ["positions", "positions.posLevel", "positions.posType"],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue