diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index 036e165..ed6a622 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -158,7 +158,11 @@ export class SalaryPeriodController extends Controller { org: item.root, total: item.total + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.total), fifteenPercent: - item.fifteenPercent + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.fifteenPercent), + item.fifteenPercent + + item.fifteenPoint + + (_salaryOrgGROUP2 == null + ? 0 + : _salaryOrgGROUP2.fifteenPercent + _salaryOrgGROUP2.fifteenPoint), chosen: item.quantityUsed + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.quantityUsed), remaining: @@ -1713,7 +1717,6 @@ export class SalaryPeriodController extends Controller { }); await this.salaryProfileEmployeeRepository.remove(salaryProfileEmployee); await this.salaryOrgEmployeeRepository.remove(salaryOrgEmployee); - let orgs = await new CallAPI().GetData(request, "org/unauthorize/active/root/id"); let total = 1000; let _orgProfiles = await new CallAPI().PostData(request, "org/unauthorize/salary/gen", {