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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2025-02-04 17:38:21 +07:00
parent a499a4a15b
commit 7957ecab1b
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/SalaryPeriodController.ts
View file

@ -2154,7 +2154,7 @@ export class SalaryPeriodController extends Controller {
} }
} }
let revisionId = await new CallAPI().GetData(request, "/org/unauthorize/revision/latest"); let revisionId = await new CallAPI().GetData(request, "/org/unauthorize/revision/latest");
let _null:any = null;
const beforeSalaryPeriod = structuredClone(salaryPeriod); const beforeSalaryPeriod = structuredClone(salaryPeriod);
salaryPeriod.revisionId = revisionId; salaryPeriod.revisionId = revisionId;
salaryPeriod.lastUpdateUserId = request.user.sub; salaryPeriod.lastUpdateUserId = request.user.sub;
@ -2172,7 +2172,7 @@ export class SalaryPeriodController extends Controller {
salaryOrgNew.salaryPeriodId = salaryPeriod.id; salaryOrgNew.salaryPeriodId = salaryPeriod.id;
salaryOrgNew.status = "PENDING"; salaryOrgNew.status = "PENDING";
salaryOrgNew.rootId = root.rootId; salaryOrgNew.rootId = root.rootId;
salaryOrgNew.rootDnaId = root.rootDnaId; salaryOrgNew.rootDnaId = root.rootDnaId??_null;
salaryOrgNew.root = root.root; salaryOrgNew.root = root.root;
salaryOrgNew.revisionId = salaryPeriod.revisionId; salaryOrgNew.revisionId = salaryPeriod.revisionId;
salaryOrgNew.snapshot = snapshot; salaryOrgNew.snapshot = snapshot;

1
src/entities/SalaryOrg.ts
View file

@ -23,6 +23,7 @@ export class SalaryOrg extends EntityBase {
rootId: string; rootId: string;
@Column({ @Column({
nullable: true,
comment: "คีย์นอก(FK)ของตาราง orgRoot Dna", comment: "คีย์นอก(FK)ของตาราง orgRoot Dna",
length: 40, length: 40,
}) })