diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs index 2b2ac1611..703f91773 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs @@ -21,8 +21,8 @@ namespace IRaCIS.Core.Application.ViewModel public Guid UpdateUserId { get; set; } public string Code { get; set; } public Guid? ParentId { get; set; } - public bool IsEnable { get; set; } - public bool IsConfig { get; set; } + public bool? IsEnable { get; set; } + public bool? IsConfig { get; set; } public string ModuleTypeId { get; set; } public string OptTypeId { get; set; } public string ChildrenTypeId { get; set; } @@ -67,25 +67,25 @@ namespace IRaCIS.Core.Application.ViewModel /// FrontAuditConfigAddOrEdit 列表查询参数模型 public class FrontAuditConfigAddOrEdit { - public Guid Id { get; set; } - public string Value { get; set; } - public string ValueCN { get; set; } - public string Description { get; set; } - public DateTime CreateTime { get; set; } + public Guid? Id { get; set; } + public string Value { get; set; } = string.Empty; + public string ValueCN { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; + public DateTime CreateTime { get; set; } public Guid CreateUserId { get; set; } public DateTime UpdateTime { get; set; } public Guid UpdateUserId { get; set; } public string Code { get; set; } = string.Empty; - public Guid? ParentId { get; set; } + public Guid? ParentId { get; set; } public bool IsEnable { get; set; } public bool IsConfig { get; set; } - public string ModuleTypeId { get; set; } = string.Empty; + public string ModuleTypeId { get; set; } = string.Empty; public string OptTypeId { get; set; } = string.Empty; - public string ChildrenTypeId { get; set; } = string.Empty; + public string ChildrenTypeId { get; set; } = string.Empty; - public string ConfigType { get; set; } = string.Empty; + public string ConfigType { get; set; } = string.Empty; - public bool? IsShowParent { get; set; } + public bool? IsShowParent { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index 10df3993e..8c754c6b8 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -95,7 +95,7 @@ namespace IRaCIS.Core.Application.Service //CreateMap(); // CreateMap< FrontAuditConfig,FrontAuditConfigAddOrEdit>().ReverseMap(); - + addOrEditFrontAuditConfig.CreateTime= DateTime.Now; addOrEditFrontAuditConfig.UpdateTime= DateTime.Now; addOrEditFrontAuditConfig.CreateUserId = _userInfo.Id; diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs index 60ce75661..7df030f85 100644 --- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs @@ -1,6 +1,7 @@ using AutoMapper; using IRaCIS.Application.Contracts; using IRaCIS.Core.Application.Contracts; +using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Domain.Models; namespace IRaCIS.Core.Application.Service @@ -16,7 +17,7 @@ namespace IRaCIS.Core.Application.Service CreateMap(); - + CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap(); diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index c23d3091c..0fa6fd641 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -18,49 +18,49 @@ namespace IRaCIS.Core.Domain.Models /// /// Value /// - [Required] + public string Value { get; set; } /// /// ValueCN /// - [Required] + public string ValueCN { get; set; } /// /// Description /// - [Required] + public string Description { get; set; } /// /// CreateTime /// - [Required] + public DateTime CreateTime { get; set; } /// /// CreateUserId /// - [Required] + public Guid CreateUserId { get; set; } /// /// UpdateTime /// - [Required] + public DateTime UpdateTime { get; set; } /// /// UpdateUserId /// - [Required] + public Guid UpdateUserId { get; set; } /// /// Code /// - [Required] + public string Code { get; set; } /// @@ -71,14 +71,14 @@ namespace IRaCIS.Core.Domain.Models /// /// IsEnable /// - [Required] - public bool IsEnable { get; set; } + + public bool? IsEnable { get; set; } /// /// IsConfig /// - [Required] - public bool IsConfig { get; set; } + + public bool? IsConfig { get; set; } /// /// ModuleTypeId