修改

2025-06-09 14:44:17 +08:00
parent ef31afa1d8
commit a2afe4f6e4
2 changed files with 22 additions and 2 deletions
@@ -154,7 +154,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
     IRepository<VisitTask> _visitTaskRepository,
        IRepository<TrialDocument> _trialDocumentRepository,
          IRepository<IdentityUser> _identityUserRepository,
-               
+              IRepository<TrialIdentityUser> _trialIdentityUserRepository,
      IRepository<Dictionary> _dictionaryRepository,
     IRepository<TrialUserRole> _trialUserRoleRepository,
     IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
@@ -180,8 +180,10 @@ 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
                from identityUser in _identityUserRepository.AsQueryable(false)
                .Where(t => t.Status == UserStateEnum.Enable &&
+                        t.Id == trialIdentityUser.IdentityUserId &&
                       t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
                       .Any(t => context.Message.NewUserTypeIds.Contains(t.UserTypeId) &&
                            trialDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
@@ -208,13 +210,15 @@ 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
                from identityUser in _identityUserRepository.AsQueryable(false)
                .Where(t => t.Status == UserStateEnum.Enable &&
+                       t.Id== trialIdentityUser.IdentityUserId&&
                       t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
                       .Any(t => trialDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
                select new UnionDocumentWithConfirmInfoView()
                {
-                    IsSystemDoc = true,
+                    IsSystemDoc = false,
                    Id = trialDoc.Id,
                    CreateTime = trialDoc.CreateTime,
                    IsDeleted = trialDoc.IsDeleted,