代码提交
parent
8bd9f9a772
commit
0d446e6fcd
|
@ -516,6 +516,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
Identification = u.Identification,
|
||||
ForeignKeyValue = p.ForeignKeyValue,
|
||||
ForeignKeyText = p.ForeignKeyText,
|
||||
p.ForeignKeyEnText,
|
||||
ForeignKeyTable = p.ForeignKeyTableName
|
||||
}).ToListAsync();
|
||||
list = list.GroupBy(x => new { x.Key }, (key, lst) => new
|
||||
|
@ -524,7 +525,8 @@ namespace IRaCIS.Core.Application.Service
|
|||
Identification = string.Empty,
|
||||
ForeignKeyValue = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyValue ?? lst.Max(x => x.ForeignKeyValue),
|
||||
ForeignKeyText = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyText ?? lst.Max(x => x.ForeignKeyText),
|
||||
ForeignKeyTable = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyTable ?? lst.Max(x => x.ForeignKeyTable),
|
||||
ForeignKeyEnText = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyTable ?? lst.Max(x => x.ForeignKeyEnText),
|
||||
ForeignKeyTable = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyTable ?? lst.Max(x => x.ForeignKeyTable),
|
||||
|
||||
}).ToList();
|
||||
|
||||
|
@ -538,6 +540,11 @@ namespace IRaCIS.Core.Application.Service
|
|||
string Table = item.ForeignKeyTable;
|
||||
string ForeignKeyValue = item.ForeignKeyValue;
|
||||
string ForeignKeyText = item.ForeignKeyText;
|
||||
if (_userInfo.IsEn_Us && !item.ForeignKeyEnText.IsNullOrEmpty())
|
||||
{
|
||||
ForeignKeyText = item.ForeignKeyEnText;
|
||||
|
||||
}
|
||||
if (jsonDataValueDic[item.Key] != null)
|
||||
{
|
||||
string value = jsonDataValueDic[item.Key].ToString();
|
||||
|
|
Loading…
Reference in New Issue