Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
789e7ea2b0
|
@ -303,7 +303,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var child = await _trialQcQuestionRepository.FirstOrDefaultAsync(x => x.ParentId == addOrEditTrialQCQuestionConfigure.Id);
|
var child = await _trialQcQuestionRepository.FirstOrDefaultAsync(x =>x.ParentId!=null&& x.ParentId == addOrEditTrialQCQuestionConfigure.Id);
|
||||||
if (child != null && child.ShowOrder < addOrEditTrialQCQuestionConfigure.ShowOrder)
|
if (child != null && child.ShowOrder < addOrEditTrialQCQuestionConfigure.ShowOrder)
|
||||||
{
|
{
|
||||||
//---父问题的显示序号要比子问题的显示序号小,请确认。
|
//---父问题的显示序号要比子问题的显示序号小,请确认。
|
||||||
|
|
|
@ -120,9 +120,8 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
|
|
||||||
Code = int.Parse(x.Code),
|
Code = int.Parse(x.Code),
|
||||||
Value = x.Value,
|
Value = _userInfo.IsEn_Us ? x.Value : x.ValueCN,
|
||||||
|
ValueCN = _userInfo.IsEn_Us ? x.Value : x.ValueCN,
|
||||||
ValueCN = x.ValueCN
|
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
||||||
return new GetTrialQuestionExportResultOutDto()
|
return new GetTrialQuestionExportResultOutDto()
|
||||||
|
|
Loading…
Reference in New Issue