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-12-17 11:06:18 +08:00
parent 4bca8859ef
commit 54ed9e5933
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Src/Dlhis.Canteen/Voucher/Services/Implements/BaseVoucherService.cs
View File

@@ -26,12 +26,13 @@ public abstract class BaseVoucherService : IVoucherService
public async Task<Pagination<VoucherPageResponse>> GetPageAsync(VoucherPageRequest request)
{
var tenantId = _currentUser.GetStringTenantId();
//var tenantId = _currentUser.GetStringTenantId();
var pagination = await DbContext.Queryable<VoucherEntity>()
.LeftJoin<VoucherUserInfoEntity>((x, u) => x.No == u.VoucherNo)
.LeftJoin<GainfoEntity>((x, u, ga) => u.UserCode == ga.Code)
.Where((x, u) => x.Type == request.Type && u.Factory == tenantId)
.Where((x, u) => x.Type == request.Type)
.WhereIF(request.Factories.IsPresent(), (x, u) => request.Factories.Contains(u.Factory))
.WhereIF(request.UserCode.IsPresent(), (x, u, ga) => u.UserCode == request.UserCode)
.WhereIF(request.SearchDateTimePeriod.HasValue(),
(x, u, ga) => x.CreateTime >= request.SearchDateTimePeriod.Start &&