diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/mapper/ReconciliationMapper.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/mapper/ReconciliationMapper.java index e68dd0b01..4546ba185 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/mapper/ReconciliationMapper.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/mapper/ReconciliationMapper.java @@ -43,7 +43,7 @@ public interface ReconciliationMapper extends BaseMapper String getDocumentPreparerNcCode(@Param("salesmanId") String salesmanId); - String getSettlementCurrencyNcCode(@Param("settlementCurrency") String settlementCurrency); + String getSettlementCurrencyNcCode(@Param("settlementCurrency") String settlementCurrency, @Param("organizationId") Long organizationId); String getServiceItemsCodeNc(@Param("name") String name); diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index c2f386f31..3246aefb4 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -754,7 +754,7 @@ public class ReconciliationImpl extends ServiceImpl> itemR = wlhyServiceFeign.selectMakeOutInvoiceItemList(make); if (itemR.getCode()==200) { @@ -1062,7 +1062,7 @@ public class ReconciliationImpl extends ServiceImpl> itemR = wlhyServiceFeign.selectMakeOutInvoiceItemList(make); if (itemR.getCode()==200) { @@ -1633,7 +1633,7 @@ public class ReconciliationImpl extends ServiceImpl - + SELECT NC_SYSTEM_CODE FROM NGWL_TEST_WLHY."TMS_SETTLEMENT_EXCHANGE_RATE" + where IS_DELETE = '0' and ENGLISH_NAME = #{settlementCurrency} + + and ORGANIZATION_ID = #{organizationId} + + limit 1