From 0d446e6fcd2b7de92290b41b14bc6614a4928900 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 27 Aug 2024 15:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Inspection/FrontAuditConfigService.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index 592ca05f9..ead87e94b 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -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();