diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/Aggregates/DataDictionary.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/Aggregates/DataDictionary.cs index dc701e0f..cca7d6b6 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/Aggregates/DataDictionary.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/Aggregates/DataDictionary.cs @@ -84,15 +84,15 @@ public class DataDictionary : FullAuditedAggregateRoot, IMultiTenant Description = description ?? string.Empty; } - public void AddDetail(Guid dataDictionayDetailId, string code, string displayText, int order = 1, + public void AddDetail(Guid dataDictionaryDetailId, string code, string displayText, int order = 1, string description = "", bool isEnabled = true) { if (Details.Any(e => e.Code == code.Trim())) { - throw new DataDictionaryDomainException(message: "数据字典项已存在"); + throw new DataDictionaryDomainException(DataDictionaryManagementErrorCodes.DataDictionaryDetailExist); } - Details.Add(new DataDictionaryDetail(dataDictionayDetailId, Id, code, displayText, order, isEnabled, + Details.Add(new DataDictionaryDetail(dataDictionaryDetailId, Id, code, displayText, order, isEnabled, description)); } @@ -101,13 +101,13 @@ public class DataDictionary : FullAuditedAggregateRoot, IMultiTenant var detail = Details.FirstOrDefault(item => item.Code == detailCode); if (null == detail) { - throw new DataDictionaryDomainException(message: "数据字典项不存在"); + throw new DataDictionaryDomainException(DataDictionaryManagementErrorCodes.DataDictionaryDetailNotExist); } Details.Remove(detail); } - public void Update(Guid dataDictionayDetailId,string displayText,string description) + public void Update(string displayText,string description) { SetDescription(description); SetDisplayText(displayText); diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs index 85cdf57c..7d7c32c6 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/DataDictionaryManager.cs @@ -170,17 +170,16 @@ namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries return await _dataDictionaryRepository.UpdateAsync(entity); } - public async Task DeleteAsync(Guid dataDictionaryId, Guid dataDictionayDetailId) + public async Task DeleteAsync(Guid dataDictionaryId, Guid dataDictionaryDetailId) { var entity = await _dataDictionaryRepository.FindByIdAsync(dataDictionaryId); if (entity == null) throw new DataDictionaryDomainException(DataDictionaryManagementErrorCodes.DataDictionaryNotExist); - var detail = entity.Details.FirstOrDefault(e => e.Id == dataDictionayDetailId); + var detail = entity.Details.FirstOrDefault(e => e.Id == dataDictionaryDetailId); if (null == detail) { throw new DataDictionaryDomainException(DataDictionaryManagementErrorCodes.DataDictionaryDetailNotExist); } - entity.Details.Remove(detail); await _dataDictionaryRepository.UpdateAsync(entity); } @@ -193,7 +192,7 @@ namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries var entity = await _dataDictionaryRepository.FindByIdAsync(dataDictionaryId); if (entity == null) throw new DataDictionaryDomainException(DataDictionaryManagementErrorCodes.DataDictionaryNotExist); - entity.Update(dataDictionaryId, displayText, description); + entity.Update(displayText, description); return await _dataDictionaryRepository.UpdateAsync(entity); } diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/IDataDictionaryManager.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/IDataDictionaryManager.cs index 9d009475..64f2ce63 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/IDataDictionaryManager.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/DataDictionaries/IDataDictionaryManager.cs @@ -52,7 +52,7 @@ public interface IDataDictionaryManager string description, int order); - Task DeleteAsync(Guid dataDictionaryId, Guid dataDictionayDetailId); + Task DeleteAsync(Guid dataDictionaryId, Guid dataDictionaryDetailId); Task UpdateAsync( Guid dataDictionaryId,