修改邮件

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -2606,7 +2606,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
     private bool IsSpmOrCPM()
     {
-        return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM;
+        return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM ;
     }
 
     /// <summary>

IRaCIS.Core.Application/Service/Document/EmailSendService.cs

@@ -1,4 +1,5 @@
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.MassTransit.Consumer;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.Extensions.Options;
@@ -20,7 +21,7 @@ namespace IRaCIS.Core.Application.Service
       IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
       IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEmailSendService
     {
-
+        private readonly SystemEmailSendConfig _systemEmailConfig = _SystemEmailSendConfig.CurrentValue;
 
         public static string EmailNamePlaceholder => StaticData.EmailSend.EmailNamePlaceholder;
 
@@ -130,6 +131,9 @@ namespace IRaCIS.Core.Application.Service
 
                 var (topicStr, htmlBodyStr, isEn_us, onlyToUserId) = topicAndHtmlFunc(trialEmailConfig);
 
+                //处理替换公司名
+                htmlBodyStr = CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlBodyStr);
+
 
                 sendEmailConfig.TopicDescription = topicStr;
                 sendEmailConfig.HtmlBodyStr = htmlBodyStr;

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -8,6 +8,7 @@ using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.MassTransit.Consumer;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Domain.Share.Common;

IRaCIS.Core.Application/TestService.cs

@@ -159,6 +159,7 @@ namespace IRaCIS.Core.Application.Service
         /// 用户多账号，初次维护数据
         /// </summary>
         /// <returns></returns>
+        [AllowAnonymous]
         public async Task<IResponseOutput> UserMutiAccount([FromServices] IRepository<IdentityUser> _identityUserRepository)
         {
 
@@ -211,6 +212,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="_trialIdentityUserRepository"></param>
         /// <returns></returns>
+        [AllowAnonymous]
         public async Task<IResponseOutput> UserTrialUser([FromServices] IRepository<TrialIdentityUser> _trialIdentityUserRepository, [FromServices] IRepository<TrialUserRole> _trialUserRoleReposiotry)
         {
             _userInfo.IsNotNeedInspection = true;
@@ -262,6 +264,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="_trialIdentityUserRepository"></param>
         /// <param name="_trialUserRoleReposiotry"></param>
         /// <returns></returns>
+        [AllowAnonymous]
         [UnitOfWork]
         public async Task<IResponseOutput> ExternalTrialUser(
             [FromServices] IRepository<TrialSiteUserSurvey> _trialSiteUserSurveyRepository,