From 7df247d5e7204d60dcc714d28089d377108506b8 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 19 Sep 2024 13:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=97=E5=85=B8=E5=BA=9F?= =?UTF-8?q?=E5=BC=83=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs | 1 - IRaCIS.Core.Application/Service/Common/DictionaryService.cs | 4 ---- IRaCIS.Core.Application/Service/Common/_MapConfig.cs | 4 ++-- IRaCIS.Core.Domain/Common/Dictionary.cs | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs index 8769f96a6..08267c180 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs @@ -136,7 +136,6 @@ namespace IRaCIS.Application.Contracts public Guid? ParentId { get; set; } public string ParentCode { get; set; } = string.Empty; - public int? ParentChildCodeEnum { get; set; } public string ChildGroup { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index 57fe7ac1c..5ad938f17 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -407,7 +407,6 @@ namespace IRaCIS.Application.Services ChildGroup = x.Dictionary.ChildGroup, Code = x.Dictionary.Code, DataTypeEnum = x.Dictionary.DataTypeEnum, - ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum, ShowOrder = x.Dictionary.ShowOrder, ParentCode = x.ParentCode, CrterionDictionaryGroup = x.CrterionDictionaryGroup, @@ -427,7 +426,6 @@ namespace IRaCIS.Application.Services ChildGroup = x.Dictionary.ChildGroup, Code = x.Dictionary.Code, DataTypeEnum = x.Dictionary.DataTypeEnum, - ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum, ShowOrder = x.Dictionary.ShowOrder, ParentCode = x.ParentCode, CrterionDictionaryGroup = x.CrterionDictionaryGroup, @@ -521,7 +519,6 @@ namespace IRaCIS.Application.Services Code = x.Dictionary.Code, Description = x.Dictionary.Description, DataTypeEnum = x.Dictionary.DataTypeEnum, - ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum, ShowOrder = x.Dictionary.ShowOrder, ParentCode = x.ParentCode, Id = x.DictionaryId, @@ -565,7 +562,6 @@ namespace IRaCIS.Application.Services Code = x.Dictionary.Code, Description = x.Dictionary.Description, DataTypeEnum = x.Dictionary.DataTypeEnum, - ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum, ShowOrder = x.Dictionary.ShowOrder, ParentCode = x.ParentCode, Id = x.DictionaryId, diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs index 916cabf1f..8cd80d6a8 100644 --- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs @@ -52,12 +52,12 @@ namespace IRaCIS.Core.Application.Service CreateMap(); CreateMap() - .ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum)) + //.ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum)) .ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us ? u.Value : u.ValueCN)) .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)); CreateMap() - .ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum)) + //.ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum)) .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)); var token = ""; diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index a028e81cd..6e18c561a 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/IRaCIS.Core.Domain/Common/Dictionary.cs @@ -29,7 +29,6 @@ namespace IRaCIS.Core.Domain.Models public string ChildGroup { get; set; } = string.Empty; - public int ChildCodeEnum { get; set; } public DicDataTypeEnum DataTypeEnum { get; set; }