Compare commits

..

No commits in common. "9c447dbd68022354a1c55f3337397fc8c64edcb0" and "c8f04a878a17e716c908ce8e856f20dcefa5a59c" have entirely different histories.

1 changed files with 1 additions and 8 deletions

View File

@ -516,7 +516,6 @@ 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
@ -525,8 +524,7 @@ 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),
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),
ForeignKeyTable = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyTable ?? lst.Max(x => x.ForeignKeyTable),
}).ToList();
@ -540,11 +538,6 @@ 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();