diff --git a/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppAnnouncementService.cs b/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppAnnouncementService.cs index 3269072..09d32ed 100644 --- a/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppAnnouncementService.cs +++ b/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppAnnouncementService.cs @@ -119,7 +119,7 @@ namespace ATS.NonCustodial.Application.Impl.Business var express = GetExpression(input, _appAnnouncementRepository.AsQueryable(false, true)); var rtn = (await base.GetPageAsync(input, express)); - // rtn.Data = rtn.Data.Where(w => appAnnouncementViewStatistics.Contains(w.Id)); + rtn.Data = rtn.Data.Where(w => appAnnouncementViewStatistics.Contains(w.Id)).ToList(); return ResultOutput.Ok(rtn); } diff --git a/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppPunchRecordService.cs b/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppPunchRecordService.cs index aa80fd5..7b99685 100644 --- a/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppPunchRecordService.cs +++ b/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppPunchRecordService.cs @@ -183,7 +183,14 @@ namespace ATS.NonCustodial.Application.Impl.Business [HttpPost] public async Task GetPunchPageAsync(AppPunchRecordGetPageInput input) { - var caseIds = await (await base.GetCurrentUserCaseListAsync()).Select(w => w.AppCaseManagement.Id).ToListAsync(); + //获取当前用户权限下的案件ids + var limits = User.limits; + var selectLimits = await _appCaseSupervisorRepository.AsQueryable(false, true) + .Where(w => limits.Contains(w.UnitId.ToString())) + .ToListAsync(); + var caseIds = selectLimits.Select(w => w.CaseId).Distinct().ToList(); + + // var caseIds = await (await base.GetCurrentUserCaseListAsync()).Select(w => w.AppCaseManagement.Id).ToListAsync(); //var list= await base._appSupervisedPersonRepository.AsQueryable(false, true).Where(q=> caseIds.Contains(q.CaseId)).ToListAsync(); var data = await _appPunchRecordStatisticsRepository