修改查询

2024-12-27 11:32:17 +08:00
parent c06681f379
commit 7853614d2d
34 changed files with 237 additions and 165 deletions
@@ -32,7 +32,7 @@ namespace IRaCIS.Core.Application.Service

        Task SiteSurveyUserJoinEmail(Guid trialId, Guid userId, string baseUrl, string rootUrl);

-        Task ExternalUserJoinEmail(Guid trialId, Guid userId, string baseUrl, string rootUrl);
+        Task ExternalUserJoinEmail(Guid trialId, Guid userId,string userTypes, string baseUrl, string rootUrl);

        Task<(Guid identityUserId, Guid userRoleId)> DoctorJoinTrialEmail(Guid trialId, Guid doctorId, string baseUrl, string rootUrl);

@@ -429,15 +429,13 @@ namespace IRaCIS.Core.Application.Service
        }

        //外部用户 加入项目
-        public async Task ExternalUserJoinEmail(Guid trialId, Guid userId, string baseUrl, string rootUrl)
+        public async Task ExternalUserJoinEmail(Guid trialId, Guid userId, string userTypes, string baseUrl, string rootUrl)
        {
            var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId)).IfNullThrowException();

            var sysUserInfo = (await _identityUserRepository.Where(t => t.Id == userId).FirstOrDefaultAsync()).IfNullThrowException();
-
-            var userTypes = await _userRoleRepository.Where(t => t.IdentityUserId == sysUserInfo.Id).Select(t => t.UserTypeRole.UserTypeShortName).ToListAsync();
-
-            var messageToSend = new MimeMessage();
+                                                                                                       
+            var messageToSend = new MimeMessage(); 
            //发件地址
            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
            //收件地址
@@ -473,7 +471,7 @@ namespace IRaCIS.Core.Application.Service
                    trialInfo.ResearchProgramNo,
                    trialInfo.TrialCode,
                    sysUserInfo.UserName,
-                    string.Join(',', userTypes),
+                    userTypes,                   
                     sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
                    );

@@ -533,7 +531,7 @@ namespace IRaCIS.Core.Application.Service
                    trialInfo.ExperimentName,
                    trialInfo.ResearchProgramNo,
                    trialInfo.TrialCode,
-                sysUserInfo.UserName,
+                    sysUserInfo.UserName,
                    string.Join(',', userTypes),
                    sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
                    );