XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is running Details

IRC_NewDev
hang 2024-08-29 10:59:21 +08:00
parent b1d6d20800 4f5006560e
commit d5023c412f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
View File

@ -202,7 +202,7 @@ namespace IRaCIS.Core.Domain.Models
public string MergeColumnEnName { get; set; } = String.Empty; public string MergeColumnEnName { get; set; } = String.Empty;
public string ColumnEnName { get; set; } = String.Empty;
public bool IsPicture { get; set; } public bool IsPicture { get; set; }

4
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -3118,7 +3118,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => questionIdList.Contains(t.Id)).Select(t => new 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, t.QuestionEnName,
QuestionId = t.Id, QuestionId = t.Id,
t.DictionaryCode, t.DictionaryCode,
@ -3136,7 +3136,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{ {
TaskBlindName = u.VisitTask.TaskBlindName, TaskBlindName = u.VisitTask.TaskBlindName,
QuestionId = u.ReadingQuestionTrialId, QuestionId = u.ReadingQuestionTrialId,
u.ReadingQuestionTrial.QuestionName, QuestionName= _userInfo.IsEn_Us ? u.ReadingQuestionTrial.QuestionEnName : u.ReadingQuestionTrial.QuestionName,
u.ReadingQuestionTrial.QuestionEnName, u.ReadingQuestionTrial.QuestionEnName,
u.ReadingQuestionTrial.DictionaryCode, u.ReadingQuestionTrial.DictionaryCode,
u.ReadingQuestionTrial.ShowOrder, u.ReadingQuestionTrial.ShowOrder,