XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-06-23 10:58:39 +08:00
parent 40fd8b0d5a b143ffbcfc
commit 1548498d3d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs
View File

@ -55,8 +55,10 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
var trialDocQuery = var trialDocQuery =
from trialDoc in _trialDocumentRepository.AsQueryable(true) 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
join trialUserRole in _trialUserRoleRepository.Where(x => x.IsDeleted == false) on trialIdentityUser.Id equals trialUserRole.TrialUserId
from identityUser in _identityUserRepository.AsQueryable(false) from identityUser in _identityUserRepository.AsQueryable(false)
.Where(t => t.Status == UserStateEnum.Enable && .Where(t => t.Status == UserStateEnum.Enable &&
t.Id == trialIdentityUser.IdentityUserId && t.Id == trialIdentityUser.IdentityUserId &&
t.UserRoleList.Where(t => t.IsUserRoleDisabled == false) t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
@ -187,7 +189,8 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
// 只查询新增角色的用户 // 只查询新增角色的用户
systemDocQuery = systemDocQuery =
from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id)) 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
join trialUserRole in _trialUserRoleRepository.Where(x => x.IsDeleted == false) on trialIdentityUser.Id equals trialUserRole.TrialUserId
from identityUser in _identityUserRepository.AsQueryable(false) from identityUser in _identityUserRepository.AsQueryable(false)
.Where(t => t.Status == UserStateEnum.Enable && .Where(t => t.Status == UserStateEnum.Enable &&
t.Id == trialIdentityUser.IdentityUserId && t.Id == trialIdentityUser.IdentityUserId &&
@ -217,7 +220,8 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
// 查询所有相关角色的用户 // 查询所有相关角色的用户
systemDocQuery = systemDocQuery =
from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id)) 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
join trialUserRole in _trialUserRoleRepository.Where(x=>x.IsDeleted==false) on trialIdentityUser.Id equals trialUserRole.TrialUserId
from identityUser in _identityUserRepository.AsQueryable(false) from identityUser in _identityUserRepository.AsQueryable(false)
.Where(t => t.Status == UserStateEnum.Enable && .Where(t => t.Status == UserStateEnum.Enable &&
t.Id== trialIdentityUser.IdentityUserId&& t.Id== trialIdentityUser.IdentityUserId&&