diff --git a/IRaCIS.Core.Application/Service/Common/PublishLogService.cs b/IRaCIS.Core.Application/Service/Common/PublishLogService.cs index 8b4274faf..70e38f447 100644 --- a/IRaCIS.Core.Application/Service/Common/PublishLogService.cs +++ b/IRaCIS.Core.Application/Service/Common/PublishLogService.cs @@ -81,7 +81,7 @@ namespace IRaCIS.Core.Application.Service } [AllowAnonymous] - public async Task GetCurrentPublishInfo([FromServices] IOptionsMonitor _sysEmialConfigOPtion) + public async Task > GetCurrentPublishInfo([FromServices] IOptionsMonitor _sysEmialConfigOPtion) { var result = await _publishLogRepository.Where(t => t.IsCurrentVersion == true).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync(); @@ -92,7 +92,13 @@ namespace IRaCIS.Core.Application.Service } result.IsEnv_US = _sysEmialConfigOPtion.CurrentValue.IsEnv_US; - return result; + + var emailConfig = _sysEmialConfigOPtion.CurrentValue; + + var companyInfo = new SystemEmailSendConfigView() { CompanyName = emailConfig.CompanyName, CompanyNameCN = emailConfig.CompanyNameCN, CompanyShortName = emailConfig.CompanyShortName, CompanyShortNameCN = emailConfig.CompanyShortNameCN, SystemShortName = emailConfig.SystemShortName, EmailRegexStr = emailConfig.EmailRegexStr }; + + + return ResponseOutput.Ok(result, companyInfo) ; }