From 6ef1fe3f1ab58c0e1de7085c561bce7ea0eabe3c Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Tue, 1 Jul 2025 17:43:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(bpm):=20=E4=BF=AE=E6=AD=A3=E6=8A=A5?=
 =?UTF-8?q?=E9=94=80=E5=8D=95=E5=92=8C=E8=B4=B7=E6=AC=BE=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91-=20?=
 =?UTF-8?q?=E5=9C=A8=20BpmOAExpensesServiceImpl=20=E4=B8=AD=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=8A=A5=E9=94=80=E5=8D=95=E7=9A=84=E5=BA=94=E4=BB=98?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91=20-=20?=
 =?UTF-8?q?=E5=9C=A8=20BpmOALoanMapper=20=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5ID=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 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