XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-08-28 13:22:15 +08:00
parent a55ba549eb cdd8250a0c
commit 2939290915
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
View File

@ -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>
/// 接口名

7
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
View File

@ -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; }

9
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -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,