From 139e1f8186e855dadf6b3baeb917c9448b313719 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 20 Jun 2025 16:46:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=80=E5=87=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=8D=E5=8F=91=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MassTransit/Recurring/TrialDocumentConsumer.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs index 40d5661bb..06a7a2cfc 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs @@ -55,7 +55,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring var trialDocQuery = from trialDoc in _trialDocumentRepository.AsQueryable(true) - join trialIdentityUser in _trialIdentityUserRepository.AsQueryable() on trialDoc.TrialId equals trialIdentityUser.TrialId + join trialIdentityUser in _trialIdentityUserRepository.Where(x => x.IsDeleted == false) on trialDoc.TrialId equals trialIdentityUser.TrialId from identityUser in _identityUserRepository.AsQueryable(false) .Where(t => t.Status == UserStateEnum.Enable && t.Id == trialIdentityUser.IdentityUserId && @@ -187,7 +187,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring // 只查询新增角色的用户 systemDocQuery = from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id)) - join trialIdentityUser in _trialIdentityUserRepository.AsQueryable() on trialDoc.TrialId equals trialIdentityUser.TrialId + join trialIdentityUser in _trialIdentityUserRepository.Where(x=>x.IsDeleted==false) on trialDoc.TrialId equals trialIdentityUser.TrialId from identityUser in _identityUserRepository.AsQueryable(false) .Where(t => t.Status == UserStateEnum.Enable && t.Id == trialIdentityUser.IdentityUserId && @@ -217,7 +217,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring // 查询所有相关角色的用户 systemDocQuery = from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id)) - join trialIdentityUser in _trialIdentityUserRepository.AsQueryable() on trialDoc.TrialId equals trialIdentityUser.TrialId + join trialIdentityUser in _trialIdentityUserRepository.Where(x => x.IsDeleted == false) on trialDoc.TrialId equals trialIdentityUser.TrialId from identityUser in _identityUserRepository.AsQueryable(false) .Where(t => t.Status == UserStateEnum.Enable && t.Id== trialIdentityUser.IdentityUserId&& From b143ffbcfc319e1de529dd2339c2c7eab6c622a6 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 20 Jun 2025 16:57:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E4=B8=8D=E5=8F=91=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MassTransit/Recurring/TrialDocumentConsumer.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs index 06a7a2cfc..955ffb18a 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs @@ -56,7 +56,9 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring from trialDoc in _trialDocumentRepository.AsQueryable(true) join trialIdentityUser in _trialIdentityUserRepository.Where(x => x.IsDeleted == false) on trialDoc.TrialId equals trialIdentityUser.TrialId + join trialUserRole in _trialUserRoleRepository.Where(x => x.IsDeleted == false) on trialIdentityUser.Id equals trialUserRole.TrialUserId from identityUser in _identityUserRepository.AsQueryable(false) + .Where(t => t.Status == UserStateEnum.Enable && t.Id == trialIdentityUser.IdentityUserId && t.UserRoleList.Where(t => t.IsUserRoleDisabled == false) @@ -188,6 +190,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring systemDocQuery = from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id)) join trialIdentityUser in _trialIdentityUserRepository.Where(x=>x.IsDeleted==false) on trialDoc.TrialId equals trialIdentityUser.TrialId + join trialUserRole in _trialUserRoleRepository.Where(x => x.IsDeleted == false) on trialIdentityUser.Id equals trialUserRole.TrialUserId from identityUser in _identityUserRepository.AsQueryable(false) .Where(t => t.Status == UserStateEnum.Enable && t.Id == trialIdentityUser.IdentityUserId && @@ -218,6 +221,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring systemDocQuery = from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id)) join trialIdentityUser in _trialIdentityUserRepository.Where(x => x.IsDeleted == false) on trialDoc.TrialId equals trialIdentityUser.TrialId + join trialUserRole in _trialUserRoleRepository.Where(x=>x.IsDeleted==false) on trialIdentityUser.Id equals trialUserRole.TrialUserId from identityUser in _identityUserRepository.AsQueryable(false) .Where(t => t.Status == UserStateEnum.Enable && t.Id== trialIdentityUser.IdentityUserId&&