Compare commits

..

No commits in common. "d56d1142cddf1e4cb4d9d7da64e68e2e0760500e" and "4026a34fcf0916704f4337afd1ac240807f1836f" have entirely different histories.

1 changed files with 3 additions and 6 deletions

View File

@ -760,7 +760,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
new
{
Value = _userInfo.IsEn_Us ? t.Value : t.ValueCN,
t.Value,
t.ValueCN,
t.Description,
t.ShowOrder,
@ -787,10 +787,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//查询出字典的Value ValueCN Des 保存
var dicIdList = allList.Select(t => t.DictionaryId).ToList();
var selectList = await _dbContext.Dictionary.Where(x => dicIdList.Contains(x.Id)).Select(t => new { t.Id,
Value= _userInfo.IsEn_Us? t.Value: t.ValueCN,
t.ValueCN, t.Description, t.ShowOrder }).ToListAsync();
var selectList = await _dbContext.Dictionary.Where(x => dicIdList.Contains(x.Id)).Select(t => new { t.Id, t.Value, t.ValueCN, t.Description, t.ShowOrder }).ToListAsync();
foreach (var list in allList.GroupBy(t => t.ParentCode))
@ -828,7 +825,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
new
{
Value = _userInfo.IsEn_Us ? t.Value : t.ValueCN,
t.Value,
t.ValueCN,
t.Description,
t.ShowOrder,