From a4237cc17818bee32c5a1762bf3c85684b481b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8D=E9=94=90?= <1565842059@qq.com>
Date: Wed, 10 Jun 2026 14:13:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(swap):=20=E4=BF=AE=E5=A4=8D=E6=94=B6?=
 =?UTF-8?q?=E7=9B=8A=E4=BA=92=E6=8D=A2=E7=BB=93=E6=9E=84=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了前端传入的结构类型参数限制
- 添加了对普通债券类收益互换和普通收益互换的固定查询条件
- 实现了临时方案以同时查询两种类型的收益互换数据
- 保留了原有的有效状态验证逻辑
- 注释说明了当前实现为临时解决方案
---
 YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
index 62ffa53f..888e067f 100644
--- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
@@ -2009,8 +2009,10 @@ namespace YLErp.Modules.SwapModule
         {
             var predicate = PredicateBuilder.Create<eod_swap_position>(n => !n.Invalid && n.PosiQuantity > 0);
             var interestPredicate = PredicateBuilder.Create<eod_swap_position>(n => !n.Invalid && n.InterestDirection > 0);
-            var tradePredicate = PredicateBuilder.Create<trade>(n => n.StructureType == req.StructureType
-                                                    && n.ValidState != "InValid");
+            var tradePredicate = PredicateBuilder.Create<trade>(n => n.ValidState != "InValid");
+            // TODO 这里暂时忽略前端传的值 暂时使用临时方案：同时查普通债券类收益互换和普通收益互换
+            tradePredicate = tradePredicate.And(n => n.StructureType == "普通债券类收益互换" || n.StructureType == "普通收益互换");
+
             if (req.ClientId > 0)
             {
                 predicate = predicate.And(x => x.ClientId == req.ClientId);