From e4b021098116fd3a3dc73701790393d3a308e6af Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 28 Aug 2024 10:54:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index d5f83d4f4..4ed2f2334 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -760,7 +760,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                             SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
                                                         new
                                                         {
-                                                            t.Value,
+                                                            Value = _userInfo.IsEn_Us ? t.Value : t.ValueCN,
                                                             t.ValueCN,
                                                             t.Description,
                                                             t.ShowOrder,
@@ -787,7 +787,10 @@ 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, 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))
@@ -825,7 +828,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                             SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
                                                         new
                                                         {
-                                                            t.Value,
+                                                            Value = _userInfo.IsEn_Us ? t.Value : t.ValueCN,
                                                             t.ValueCN,
                                                             t.Description,
                                                             t.ShowOrder,

From cdd8250a0c2b641417398f8e5ca59adf00021e0e Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 28 Aug 2024 11:22:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/DTO/FrontAuditConfigViewModel.cs       | 8 ++++++++
 IRaCIS.Core.Domain/Common/FrontAuditConfig.cs             | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
index 19575e63c..e1ca30669 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
@@ -220,6 +220,12 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string ChildDataLabel { get; set; }
 
+
+        /// <summary>
+        /// 前端渲染数组  数组名 和数组值 英文名称
+        /// </summary>
+        public string ChildDataEnLabel { get; set; } = string.Empty;
+
         /// <summary>
         /// 子数据Value
         /// </summary>
@@ -274,6 +280,8 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public string ForeignKeyEnText { get; set; } = string.Empty;
 
+       
+
 
         /// <summary>
         /// 接口名
diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
index 858d8a4db..7a6f06dd6 100644
--- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
+++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
@@ -84,6 +84,13 @@ namespace IRaCIS.Core.Domain.Models
 
         //前端渲染数组  数组名 和数组值
         public string ChildDataLabel { get; set; }
+
+
+        /// <summary>
+        /// 前端渲染数组  数组名 和数组值 英文名称
+        /// </summary>
+        public string ChildDataEnLabel { get; set; } = string.Empty;
+        
         public string ChildDataValue { get; set; }