From 9040bf8c955fcd48ece5001a2e57c8381ab91aa5 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Sat, 23 Mar 2024 01:53:57 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=B6=88=E8=B4=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Services/Implements/BalanceService.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 49211b0d..98aa0ded 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -514,7 +514,13 @@ public class BalanceService : IBalanceService public async Task> GetPageByUserAsync(BalanceRecordUserPageRequest request) { //当前用户 - var userId = _currentUser.GetIntSubjectId(); + var subjectId = _currentUser.GetIntSubjectId(); + var gainfo = await _dbContext.Queryable().Where(x => x.IdentityUserId == subjectId).FirstAsync(); + var jinkoCode = _currentUser.GetUserClaim("jinko-code") ?? string.Empty; + if (jinkoCode.IsPresent()) + { + gainfo = await _dbContext.Queryable().Where(x => x.Code == jinkoCode).FirstAsync(); + } var page = await _dbContext.Queryable() .LeftJoin((record, ga) => record.UserNo == ga.No) @@ -525,7 +531,7 @@ public class BalanceService : IBalanceService .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDate >= request.SearchDateTimePeriod.Start) .WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDate <= request.SearchDateTimePeriod.End) .WhereIF(request.ApplicationType.HasValue, record => record.ApplicationType == request.ApplicationType) - .Where((record, ga) => ga.IdentityUserId == userId) + .Where((record, ga) => ga.Code == gainfo.Code) .OrderBy(record => record.CreateTime, OrderByType.Desc) .Select((record, ga, department, bplace, bshiftR, shift) => new BalanceRecordUserResponse {