修改邮件发送

2024-12-31 11:18:44 +08:00
parent da570f8c5a
commit bfed24028a
3 changed files with 21 additions and 14 deletions
@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service

        Task AdminResetPwdSendEmailAsync(Guid userId, string pwdNotMd5 = "123456");

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

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

@@ -301,8 +301,8 @@ namespace IRaCIS.Core.Application.Service
                var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),

                  sysUserInfo.FullName,
-                   sysUserInfo.UserName,
-                    string.Join(',', sysUserInfo.UserRoleList.Select(t => t.UserTypeRole.UserTypeShortName)),
+                   sysUserInfo.EMail,
+                    //string.Join(',', sysUserInfo.UserRoleList.Select(t => t.UserTypeRole.UserTypeShortName)),
                    redirectUrl
                    );

@@ -339,7 +339,7 @@ namespace IRaCIS.Core.Application.Service

                    sysUserInfo.FullName,
                   sysUserInfo.UserName,
-                  string.Join(',', sysUserInfo.UserRoleList.Select(t => t.UserTypeRole.UserTypeShortName)),
+                   //string.Join(',', sysUserInfo.UserRoleList.Select(t => t.UserTypeRole.UserTypeShortName)),
                   pwdNotMd5
                    );

@@ -470,7 +470,7 @@ namespace IRaCIS.Core.Application.Service
                    trialInfo.ExperimentName,
                    trialInfo.ResearchProgramNo,
                    trialInfo.TrialCode,
-                    sysUserInfo.UserName,
+                    sysUserInfo.EMail,
                    userTypes,
                     sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
                    );
@@ -487,12 +487,11 @@ namespace IRaCIS.Core.Application.Service
        }

        //Site调研 用户加入项目
-        public async Task SiteSurveyUserJoinEmail(Guid trialId, Guid userId, string baseUrl, string rootUrl)
+        public async Task SiteSurveyUserJoinEmail(Guid trialId, Guid userId, string userTypes, string baseUrl, string rootUrl)
        {
            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 trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);

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

@@ -646,7 +645,7 @@ namespace IRaCIS.Core.Application.Service
                    trialInfo.ResearchProgramNo,
                    trialInfo.TrialCode,
                    sysUserInfo.UserName,
-                    userType.UserTypeShortName,
+                    $"{userType.UserTypeShortName} ({userType.UserTypeName})",
                    sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
                    );