From d48333e71ec6a1c8a02772234fa822fe4c1f629c Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 24 Aug 2023 13:09:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=82=AE=E4=BB=B6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9--024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_PipelineExtensions/HangfireConfig.cs | 2 +- .../Document/TrialEmailNoticeConfigService.cs | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.API/_PipelineExtensions/HangfireConfig.cs b/IRaCIS.Core.API/_PipelineExtensions/HangfireConfig.cs index 564b70a91..60ad45a47 100644 --- a/IRaCIS.Core.API/_PipelineExtensions/HangfireConfig.cs +++ b/IRaCIS.Core.API/_PipelineExtensions/HangfireConfig.cs @@ -18,7 +18,7 @@ namespace IRaCIS.Core.API { - app.UseHangfireDashboard("/api/hangfire", new DashboardOptions() + app.UseHangfireDashboard("/hangfire", new DashboardOptions() { //直接访问，没有带token 获取不到用户身份信息，所以这种自定义授权暂时没法使用 //Authorization = new[] { new hangfireAuthorizationFilter() } diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 437d0c8e0..1eb6fe74f 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -1508,8 +1508,8 @@ namespace IRaCIS.Core.Application.Service var query = _trialUserRepository.Where(t => t.TrialId == trialId, false, true).IgnoreQueryFilters().Select(t => t.User.UserTypeRole).Distinct() - .ProjectTo(_mapper.ConfigurationProvider); - + .ProjectTo(_mapper.ConfigurationProvider); + return await query.ToListAsync(); } @@ -1517,11 +1517,19 @@ namespace IRaCIS.Core.Application.Service /// /// 黑名单用户Id 列表 /// - /// + /// /// - public async Task> GetTrialUserIdSelectList(Guid trialId) + public async Task> GetTrialUserIdSelectList(Guid trialEmailNoticeConfigId) { - var query = _trialUserRepository.Where(t => t.TrialId == trialId, false, true).IgnoreQueryFilters() + + var trialEmailNoticeConfig = await _trialEmailNoticeConfigRepository.Where(t => t.Id == trialEmailNoticeConfigId).Include(t => t.TrialEmailNoticeUserList).FirstNotNullAsync(); + + var trialId = trialEmailNoticeConfig.TrialId; + + var userTypeList = trialEmailNoticeConfig.TrialEmailNoticeUserList.Select(t => t.UserType).ToList(); + + + var query = _trialUserRepository.Where(t => t.TrialId == trialId && userTypeList.Contains(t.User.UserTypeEnum), false, true).IgnoreQueryFilters() .Select(t => new TrialSelectUser() { UserId = t.UserId,