From 491cda9846a8f4f7deea2d8534aadb5241d4a945 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 25 Feb 2025 14:10:38 +0800 Subject: [PATCH] fix . --- .../Organization/Services/Implements/GainfoService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs index c1f57f8c..ab1bc079 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs @@ -70,7 +70,7 @@ public class GainfoService : IGainfoService var where = LinqExpressionExtensions.False(); var factories = _currentUser.GetUserClaim("tenants").Split(",").ToList(); request.DepartmentSelections = request.DepartmentSelections.Where(x => factories.Contains(x.Tenant)).ToList(); - + if (request.DepartmentSelections.Any()) { foreach (var item in request.DepartmentSelections) @@ -124,7 +124,7 @@ public class GainfoService : IGainfoService : _gainfoStore.Queryable(request.Status) .WhereIF(request.SearchType.HasValue, where) .LeftJoin((gainfo, department) => gainfo.DepartmentNo == department.No) - .WhereIF(request.SearchType == GainfoSearchEnumType.BusinessTrip, gainfo => SqlFunc.Subqueryable() + .WhereIF(request.SearchType.HasValue == false, gainfo => SqlFunc.Subqueryable() .Where(p => p.Code == gainfo.Code && factories.Contains(p.Destination) && SqlFunc.DateIsSame(p.BeginDate, today)) .Any()) .WhereIF(request.Search.IsPresent() && request.SearchType != GainfoSearchEnumType.Outsource, gainfo =>