From 5ef61b834e73780cb6d0b2971ae34aac8e6b51b0 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Tue, 1 Jul 2025 17:54:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(bpm):=20=E6=9B=B4=E6=96=B0=E6=8A=A5?=
 =?UTF-8?q?=E9=94=80=E5=8D=95=E5=92=8C=E8=B4=B7=E6=AC=BE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改报销单服务实现，更新应付款金额计算逻辑
- 增加贷款查询时的员工ID筛选条件
---
 .../yudao/module/bpm/service/oa/BpmOAExpensesServiceImpl.java | 2 +-
 .../src/main/resources/mapper/oa/BpmOALoanMapper.xml          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 09595435..a7e286cd 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