yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix .

Browse Source
This commit is contained in:
liguoyang
2025-02-25 14:10:38 +08:00
parent b437e18b1c
commit 491cda9846
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -70,7 +70,7 @@ public class GainfoService : IGainfoService
var where = LinqExpressionExtensions.False<GainfoEntity>(); var where = LinqExpressionExtensions.False<GainfoEntity>();
var factories = _currentUser.GetUserClaim("tenants").Split(",").ToList(); var factories = _currentUser.GetUserClaim("tenants").Split(",").ToList();
request.DepartmentSelections = request.DepartmentSelections.Where(x => factories.Contains(x.Tenant)).ToList(); request.DepartmentSelections = request.DepartmentSelections.Where(x => factories.Contains(x.Tenant)).ToList();
if (request.DepartmentSelections.Any()) if (request.DepartmentSelections.Any())
{ {
foreach (var item in request.DepartmentSelections) foreach (var item in request.DepartmentSelections)
@@ -124,7 +124,7 @@ public class GainfoService : IGainfoService
: _gainfoStore.Queryable(request.Status) : _gainfoStore.Queryable(request.Status)
.WhereIF(request.SearchType.HasValue, where) .WhereIF(request.SearchType.HasValue, where)
.LeftJoin<DepartmentEntity>((gainfo, department) => gainfo.DepartmentNo == department.No) .LeftJoin<DepartmentEntity>((gainfo, department) => gainfo.DepartmentNo == department.No)
.WhereIF(request.SearchType == GainfoSearchEnumType.BusinessTrip, gainfo => SqlFunc.Subqueryable<BusinessTripEntity>() .WhereIF(request.SearchType.HasValue == false, gainfo => SqlFunc.Subqueryable<BusinessTripEntity>()
.Where(p => p.Code == gainfo.Code && factories.Contains(p.Destination) && SqlFunc.DateIsSame(p.BeginDate, today)) .Where(p => p.Code == gainfo.Code && factories.Contains(p.Destination) && SqlFunc.DateIsSame(p.BeginDate, today))
.Any()) .Any())
.WhereIF(request.Search.IsPresent() && request.SearchType != GainfoSearchEnumType.Outsource, gainfo => .WhereIF(request.Search.IsPresent() && request.SearchType != GainfoSearchEnumType.Outsource, gainfo =>