Browse Source

Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

jiangjc 1 month ago
parent
commit
46286649f6

+ 2 - 0
OASystem/OASystem.Domain/Dtos/Financial/ForForeignReceivablesDto.cs

@@ -18,6 +18,8 @@ namespace OASystem.Domain.Dtos.Financial
 
         public int PageSize { get; set; }
         public int PageIndex { get; set; }
+
+        public string SearchValue { get; set; }
     }
 
     /// <summary>

+ 2 - 0
OASystem/OASystem.Infrastructure/Repositories/Financial/ForeignReceivablesRepository.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using EyeSoft.Extensions;
 using MathNet.Numerics.Statistics.Mcmc;
 using NPOI.SS.Formula.Functions;
 using OASystem.Domain;
@@ -345,6 +346,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
             var expressionWhere = Expressionable.Create<Grp_DelegationInfo>()
                                                 .And(x => x.IsDel == 0 && x.TeamName != "")
                                                 .AndIF(userInfos.Count > 0, x => x.JietuanOperator == dto.CurrUserId)
+                                                .AndIF(!dto.SearchValue.IsNullOrWhiteSpace(),x=> x.TeamName.Contains(dto.SearchValue))
                                                 .ToExpression();
 
             var totalNumber = 0;