diff --git a/Src/Dlhis.External/OpenApi/Services/Implements/GainfoService.cs b/Src/Dlhis.External/OpenApi/Services/Implements/GainfoService.cs index d9d794dd..b013d9cb 100644 --- a/Src/Dlhis.External/OpenApi/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.External/OpenApi/Services/Implements/GainfoService.cs @@ -51,29 +51,27 @@ public class GainfoService : IGainfoService }) .ToListAsync(); - // var gainfoLeaves = await _dbContext.Queryable().AS("GainfoLeave") - // .LeftJoin((x, d) => x.DepartmentNo == d.No) - // .Where(x => factories.Contains(x.Factory)) - // .Where(x => SqlFunc.Subqueryable() - // .Where(p => factories.Contains(p.Factory)) - // .Where(p => p.Code == x.Code) - // .NotAny() - // ) - // .Select((x, d) => new GainfoOpenResponse - // { - // Code = x.Code, - // DepartmentNo = x.DepartmentNo, - // DepartmentName = d.Name, - // Name = x.Name, - // Gender = x.Gender, - // Factory = x.Factory, - // Status = GainfoStatusEnumType.Leave, - // }) - // .ToListAsync(); - // - // return gainfos.Concat(gainfoLeaves).ToList(); + var gainfoLeaves = await _dbContext.Queryable().AS("GainfoLeave") + .LeftJoin((x, d) => x.DepartmentNo == d.No) + .Where(x => x.Factory == "2401") + .Where(x => SqlFunc.Subqueryable() + .Where(p => p.Factory == "2401") + .Where(p => p.Code == x.Code) + .NotAny() + ) + .Select((x, d) => new GainfoOpenResponse + { + Code = x.Code, + DepartmentNo = x.DepartmentNo, + DepartmentName = d.Name, + Name = x.Name, + Gender = x.Gender, + Factory = x.Factory, + Status = GainfoStatusEnumType.Leave, + }) + .ToListAsync(); - return gainfos; + return gainfos.Concat(gainfoLeaves).ToList(); } ///