From aa7315e23967fb25fda7d058af5efc4b243324c0 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Thu, 18 Jun 2026 19:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=B1=87?=
 =?UTF-8?q?=E7=8E=87=E6=97=B6=20=E6=9F=A5=E8=AF=A2=E5=88=B0=E5=A4=9A?=
 =?UTF-8?q?=E6=9D=A1=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/reconciliation/ReconciliationApplicationService.java | 2 +-
 .../domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java   | 2 +-
 .../src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
index 31cff0ef2..e51e7d7c4 100644
--- a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
+++ b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
@@ -209,7 +209,7 @@ public class ReconciliationApplicationService {
                         reconciliationPO.setSettlementCurrency(tmsOrder.getSettlementCurrency());
                     }
                     if (reconciliationPO.getSettlementCurrency() != null){
-                        String s = tmsReceiptMapper.selectCnName(String.valueOf(reconciliationPO.getSettlementCurrency()));
+                        String s = tmsReceiptMapper.selectCnName(String.valueOf(reconciliationPO.getSettlementCurrency()), reconciliationPO.getOrganizationId());
                         reconciliationPO.setSettlementCurrencyName(s);
                     }
                 }
diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java
index b6d130ca3..b5433d9c1 100644
--- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java
+++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java
@@ -20,5 +20,5 @@ public interface TmsReceiptMapper extends BaseMapper<TmsReceipt>
      */
     public List<TmsReceiptPO> queryList(TmsReceiptDO tmsReceiptDO);
 
-    String selectCnName(@Param("settlementCount") String settlementCount);
+    String selectCnName(@Param("settlementCount") String settlementCount, @Param("organizationId") Long organizationId);
 }
diff --git a/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml b/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml
index 65777d7e9..511ebef8d 100644
--- a/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml
+++ b/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml
@@ -123,6 +123,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTmsReceiptPo1"/>
     </select>
     <select id="selectCnName" resultType="java.lang.String">
-        select chinese_name from NGWL_TEST_WLHY.TMS_SETTLEMENT_EXCHANGE_RATE where english_name = #{settlementCount}
+        select chinese_name from NGWL_TEST_WLHY.TMS_SETTLEMENT_EXCHANGE_RATE where IS_DELETE = '0' and ORGANIZATION_ID = #{organizationId} and english_name = #{settlementCount} limit 1
     </select>
 </mapper>
\ No newline at end of file