From d3611ef310389e88f0e9a9d192f094392b56c1b7 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 28 Aug 2024 14:53:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 86968dcb2..83bcad7a4 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -3118,7 +3118,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => questionIdList.Contains(t.Id)).Select(t => new { - t.QuestionName, + QuestionName=_userInfo.IsEn_Us?t.QuestionEnName: t.QuestionName, t.QuestionEnName, QuestionId = t.Id, t.DictionaryCode, @@ -3136,7 +3136,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common { TaskBlindName = u.VisitTask.TaskBlindName, QuestionId = u.ReadingQuestionTrialId, - u.ReadingQuestionTrial.QuestionName, + QuestionName= _userInfo.IsEn_Us ? u.ReadingQuestionTrial.QuestionEnName : u.ReadingQuestionTrial.QuestionName, u.ReadingQuestionTrial.QuestionEnName, u.ReadingQuestionTrial.DictionaryCode, u.ReadingQuestionTrial.ShowOrder, From 4f5006560e568f667a8a96f805341dbcb6900c8a Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 28 Aug 2024 15:25:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Domain/Common/FrontAuditConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index 7a6f06dd6..69347fb0b 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -202,7 +202,7 @@ namespace IRaCIS.Core.Domain.Models public string MergeColumnEnName { get; set; } = String.Empty; - + public string ColumnEnName { get; set; } = String.Empty; public bool IsPicture { get; set; }