代码修改
parent
2caa7933ee
commit
e4b0210981
|
@ -760,7 +760,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
|
SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
t.Value,
|
Value = _userInfo.IsEn_Us ? t.Value : t.ValueCN,
|
||||||
t.ValueCN,
|
t.ValueCN,
|
||||||
t.Description,
|
t.Description,
|
||||||
t.ShowOrder,
|
t.ShowOrder,
|
||||||
|
@ -787,7 +787,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
//查询出字典的Value ValueCN Des 保存
|
//查询出字典的Value ValueCN Des 保存
|
||||||
var dicIdList = allList.Select(t => t.DictionaryId).ToList();
|
var dicIdList = allList.Select(t => t.DictionaryId).ToList();
|
||||||
|
|
||||||
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();
|
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();
|
||||||
|
|
||||||
|
|
||||||
foreach (var list in allList.GroupBy(t => t.ParentCode))
|
foreach (var list in allList.GroupBy(t => t.ParentCode))
|
||||||
|
@ -825,7 +828,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
|
SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
t.Value,
|
Value = _userInfo.IsEn_Us ? t.Value : t.ValueCN,
|
||||||
t.ValueCN,
|
t.ValueCN,
|
||||||
t.Description,
|
t.Description,
|
||||||
t.ShowOrder,
|
t.ShowOrder,
|
||||||
|
|
Loading…
Reference in New Issue