diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAExpensesServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAExpensesServiceImpl.java index 2f5bcc16..547c6393 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAExpensesServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAExpensesServiceImpl.java @@ -284,7 +284,7 @@ public class BpmOAExpensesServiceImpl extends BpmOABaseService implements BpmOAE .setObjectId(id) .setType(9) .setStatus(0) - .setAmountPayable(expenses.getTotalMoney()) + .setAmountPayable(expenses.getTotalMoney().subtract(expenses.getAmountPaid())) .setProcessInstanceName(processInstance.getName()) .setBeginTime(processInstance.getCreateTime()) .setEndTime(processInstance.getEndTime()) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOALoanMapper.xml b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOALoanMapper.xml index a592f57d..4286765c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOALoanMapper.xml +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOALoanMapper.xml @@ -61,9 +61,11 @@ bpm_oa_expenses e LEFT JOIN system_users u ON e.user_id = u.id LEFT JOIN system_dept d ON u.dept_id = d.id + LEFT JOIN sf_staff sf ON u.idcard = sf.id_card LEFT JOIN bpm_process_instance_ext p ON e.process_instance_id = p.process_instance_id WHERE - e.deleted = 0 + sf.id = #{pageReqVO.staffId} + AND e.deleted = 0 AND e.result = 2 AND e.status = 2 AND u.deleted = 0