diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 095457946..c83d4a445 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2340,7 +2340,7 @@ 根据用户Id获取用户详细信息[New] - + xiuga diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index ce57d3add..667681b1a 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -800,6 +800,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common var trialQCQuestionConfigureDatas = await _dbContext.TrialQCQuestionConfigure.Where(x => ids.Contains(x.Id)).ToListAsync(); var collect = questionAnswers.GroupJoin(trialQCQuestionConfigureDatas, one => one.TrialQCQuestionConfigureId, two => two.Id, (x, y) => new { one = x, two = y }) .SelectMany(a => a.two.DefaultIfEmpty(), (c, d) => new { c = c.one, d }) + .OrderBy(x=>x.d.ShowOrder) .Select(o => new AnswerDto() { QuestionName = o.d.QuestionName,