diff --git a/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppManagementService.cs b/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppManagementService.cs index 2124bfc..6d5a12e 100644 --- a/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppManagementService.cs +++ b/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppManagementService.cs @@ -1149,10 +1149,15 @@ namespace ATS.NonCustodial.Application.Impl.Business /// public async Task>> GetRemindListByCurrentUserPageAsync(AppRemindPageInput input) { + var limits = User.limits; + var selectLimits = await _appCaseSupervisorRepository.AsQueryable(false, true) + .Where(w => limits.Contains(w.UnitId.ToString())) + .ToListAsync(); + var caseIdList = selectLimits.Select(w => w.CaseId).Distinct().ToList(); //预警信息 var earlyList = await (from e in _appEarlyWarningRepository.AsQueryable(false, true) join ev in _appEarlyWarningViewStatisticsRepository.AsQueryable(false, true) on e.Id equals ev.AppEarlyWarningId - where ev.SubscriberId == User.Id + where ev.SubscriberId == User.Id && caseIdList.Contains(e.CaseId) select new AppRemindListDto() { Id = e.Id, 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 7b99685..bf2f086 100644 --- a/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppPunchRecordService.cs +++ b/src/2.services/ATS.NonCustodial.Application/Impl/Business/AppPunchRecordService.cs @@ -415,11 +415,13 @@ namespace ATS.NonCustodial.Application.Impl.Business [HttpGet, AllowAnonymous] public async Task CheckPunchRecordForJob1() { + var limits = User.limits; + //[1]获取所有正在执行中的被监管人案件 var allCaseList = await (from c in _appCaseManagementRepository.AsQueryable(false, true) join csr in _appCaseSupervisorRepository.AsQueryable(false, true) on c.Id equals csr.CaseId join cspr in _appSupervisedPersonRepository.AsQueryable(false, true) on c.Id equals cspr.CaseId - where c.CaseProgress != CaseProgressEnum.Pending&& c.CaseProgress != CaseProgressEnum.Closed + where c.CaseProgress != CaseProgressEnum.Pending&& c.CaseProgress != CaseProgressEnum.Closed && limits.Contains((char)csr.UnitId) select new CheckPunchRecordForJobOutput() { CaseId = c.Id, @@ -547,11 +549,12 @@ namespace ATS.NonCustodial.Application.Impl.Business [HttpGet, AllowAnonymous] public async Task CheckPunchRecordForJob() { + var limits = User.limits; //[1]获取所有正在执行中的被监管人案件 var allCaseList = await (from c in _appCaseManagementRepository.AsQueryable(false, true) join csr in _appCaseSupervisorRepository.AsQueryable(false, true) on c.Id equals csr.CaseId join cspr in _appSupervisedPersonRepository.AsQueryable(false, true) on c.Id equals cspr.CaseId - where c.CaseProgress != CaseProgressEnum.Pending && c.CaseProgress != CaseProgressEnum.Closed && cspr.ApprovalStatus == ApprovalStatusEnum.PassReview + where c.CaseProgress != CaseProgressEnum.Pending && c.CaseProgress != CaseProgressEnum.Closed && cspr.ApprovalStatus == ApprovalStatusEnum.PassReview && limits.Contains(csr.UnitId.ToString()) select new CheckPunchRecordForJobOutput() { CaseId = c.Id, diff --git a/src/2.services/ATS.NonCustodial.Application/Impl/Business/MaterialManager/AppFileDescriptorService.cs b/src/2.services/ATS.NonCustodial.Application/Impl/Business/MaterialManager/AppFileDescriptorService.cs index 0e015d6..5122582 100644 --- a/src/2.services/ATS.NonCustodial.Application/Impl/Business/MaterialManager/AppFileDescriptorService.cs +++ b/src/2.services/ATS.NonCustodial.Application/Impl/Business/MaterialManager/AppFileDescriptorService.cs @@ -146,6 +146,8 @@ namespace ATS.NonCustodial.Application.Impl.Business.MaterialManager /// /// [HttpPut] + [RequestSizeLimit(200 * 1024 * 1024)] // 200MB + [RequestFormLimits(MultipartBodyLengthLimit = 200 * 1024 * 1024)] // 200MB public async Task UploadFile(long? directoryId, [FromForm] IFormFile file) { var uploadConfig = LazyGetRequiredService();