diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 4bf6736e..7bf671ed 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -1603,9 +1603,29 @@ export class CommandController extends Controller { let commandRecive = new CommandRecive(); commandRecive = Object.assign(new CommandRecive(), item); commandRecive.order = order; - // commandRecive.amount = "xxxxxxxxxx"; - // commandRecive.positionSalaryAmount = "xxxxxxxxxx"; - // commandRecive.mouthSalaryAmount = "xxxxxxxxxx"; + let salaryData = null_; + if(item.profileId){ + salaryData = await this.profileRepository.findOne({ + where: { + id: item.profileId + } + }); + let null_: any = 0; + if (!salaryData) { + salaryData = await this.profileEmployeeRepository.findOne({ + where: { + id: item.profileId + } + }); + } + commandRecive.amount = salaryData ? salaryData.amount : null_; + commandRecive.positionSalaryAmount = salaryData ? salaryData.positionSalaryAmount : null_; + commandRecive.mouthSalaryAmount = salaryData ? salaryData.mouthSalaryAmount : null_; + }else{ + commandRecive.amount = null_; + commandRecive.positionSalaryAmount = null_; + commandRecive.mouthSalaryAmount = null_; + } commandRecive.remarkVertical = item.remarkVertical == null ? null_ : item.remarkVertical; commandRecive.remarkHorizontal =