bug fix

YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs

@@ -1571,7 +1571,7 @@ namespace YLErp.Modules.SwapModule
         /// <returns></returns>
         public SearchListResult<SwapPositionResponse> SearchEodPositionList(EodSwapPositionQueryRequest req)
         {
-            var predicate = PredicateBuilder.Create<eod_swap_position>(n => !n.Invalid && n.PosiDirection > 0);
+            var predicate = PredicateBuilder.Create<eod_swap_position>(n => !n.Invalid);
             var tradePredicate = PredicateBuilder.Create<trade>(n => n.TradeType == "收益互换"
                                                     && n.ValidState != "InValid");
             if (req.ValueDate.HasValue)

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;
                 }