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(n => !n.Invalid && n.PosiQuantity > 0); var interestPredicate = PredicateBuilder.Create(n => !n.Invalid && n.InterestDirection > 0); - var tradePredicate = PredicateBuilder.Create(n => n.StructureType == req.StructureType - && n.ValidState != "InValid"); + var tradePredicate = PredicateBuilder.Create(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);