From 8a3e9126c91f0229589b9599bd998f982dd81b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Wed, 23 Apr 2025 18:09:52 +0800 Subject: [PATCH] bug fix --- YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs | 2 +- YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs index 35559e7e..d17fe9a6 100644 --- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs @@ -1571,7 +1571,7 @@ namespace YLErp.Modules.SwapModule /// public SearchListResult SearchEodPositionList(EodSwapPositionQueryRequest req) { - var predicate = PredicateBuilder.Create(n => !n.Invalid && n.PosiDirection > 0); + var predicate = PredicateBuilder.Create(n => !n.Invalid); var tradePredicate = PredicateBuilder.Create(n => n.TradeType == "收益互换" && n.ValidState != "InValid"); if (req.ValueDate.HasValue) diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js index 6f033b4e..1dea3d78 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js +++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js @@ -335,7 +335,7 @@ const vue = new Vue({ if (this.trade.trade_extend.ExtendObj.InterestCalcMode == "00" || this.trade.trade_extend.ExtendObj.InterestCalcMode == "10") { date = moment(date).add(-1, 'days').format('YYYY-MM-DD'); } - this.getSwapList.forEach(x => { + this.getSwapList.forEach((x,index) => { if ((x.UnderlyingCode == null || x.UnderlyingCode.length == 0) && x.SwapIntervalList.length == 0) { var interval = { Date: date, @@ -344,8 +344,8 @@ const vue = new Vue({ } x.SwapIntervalList.push(interval); } - if (x.InterestType == 1 && x.interest_rest_days<0) { - main.message("利息端第" + (index + 1) + "重置频率必须大于0"); + if (x.InterestType == 1 && x.interest_rest_days<=0) { + main.message("利息端第" + (index + 1) + "行重置频率必须大于0"); errorcount++; return false; }