diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs index cf8a3a95c..f3f1e32ab 100644 --- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs @@ -3,6 +3,7 @@ using IRaCIS.Application.Contracts; using IRaCIS.Core.Application.Contracts; using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Domain.Models; +using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Application.Service { @@ -20,25 +21,31 @@ namespace IRaCIS.Core.Application.Service CreateMap().ReverseMap(); CreateMap().ReverseMap(); + + + CreateMap(); + + var trialId = Guid.Empty; CreateMap().IncludeBase() .ForMember(o => o.IsHaveSelected, t => t.MapFrom(u => u.TrialEmailNoticeConfigList.Any(c => c.TrialId == trialId && c.SysEmailNoticeConfigId == u.Id))) ; CreateMap() - .ForMember(t => t.EmailNoticeUserList, u => u.MapFrom(c => c.EmailNoticeUserTypeList)); - + .ForMember(t => t.EmailNoticeUserList, u => u.MapFrom(c => c.EmailNoticeUserTypeList)); + CreateMap() + .ForMember(t => t.ParentCode, u => u.MapFrom(c => c.Parent.Code)); CreateMap(); var isEn_Us = false; CreateMap() .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)) - .ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us? u.Value:u.ValueCN)); + .ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us ? u.Value : u.ValueCN)); CreateMap().ReverseMap(); - + CreateMap() .ForMember(o => o.ConfigType, t => t.MapFrom(u => u.ConfigDictionary.Code)); @@ -51,7 +58,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() .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.Value, t => t.MapFrom(u => isEn_Us ? u.Value : u.ValueCN)) .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)); CreateMap() @@ -59,7 +66,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)); var token = ""; - CreateMap() + CreateMap() .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token)); CreateMap().ReverseMap(); @@ -68,7 +75,7 @@ namespace IRaCIS.Core.Application.Service CreateMap().ReverseMap(); CreateMap(); - + CreateMap(); CreateMap().ReverseMap(); @@ -76,5 +83,5 @@ namespace IRaCIS.Core.Application.Service } } - + } diff --git a/IRaCIS.Core.Domain/SQLFile/23231012.sql b/IRaCIS.Core.Domain/SQLFile/23231012.sql new file mode 100644 index 000000000..79bd6d1e8 --- /dev/null +++ b/IRaCIS.Core.Domain/SQLFile/23231012.sql @@ -0,0 +1,15 @@ +-- 查询指定 code 的记录及其父项 +SELECT * +FROM Dictionary +WHERE code = 'BusinessModule' + +UNION + +-- 查询指定 code 的记录及其子项 +SELECT t.* +FROM Dictionary t +INNER JOIN ( + SELECT Id + FROM Dictionary + WHERE code = 'BusinessModule' +) AS selected ON t.ParentId = selected.Id; diff --git a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj index ccebbacad..1e2a42979 100644 --- a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj +++ b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj @@ -17,8 +17,7 @@ - - + diff --git a/IRaCIS.Core.Infra.EFCore/Repository/IRaCISContextExtension.cs b/IRaCIS.Core.Infra.EFCore/Repository/IRaCISContextExtension.cs index 5428578f6..547a5119b 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/IRaCISContextExtension.cs +++ b/IRaCIS.Core.Infra.EFCore/Repository/IRaCISContextExtension.cs @@ -157,7 +157,7 @@ namespace IRaCIS.Core.Infra.EFCore { if (deleteFilter == null) throw new ArgumentNullException(nameof(deleteFilter)); - return await _dbContext.Set().IgnoreQueryFilters().Where(deleteFilter).BatchDeleteAsync() > 0; + return await _dbContext.Set().IgnoreQueryFilters().Where(deleteFilter).ExecuteDeleteAsync() > 0; } diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs index b61540bf4..b445532c2 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs +++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs @@ -194,7 +194,6 @@ namespace IRaCIS.Core.Infra.EFCore _dbContext.EntityModifyPartialFiled(entity, updateFactory); - await SaveChangesAsync(autoSave); } diff --git a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj index 9976f5251..2241479bb 100644 --- a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj +++ b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj @@ -12,6 +12,8 @@ + +