diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs index 12710c1fe..8aada8e17 100644 --- a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs +++ b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs @@ -49,6 +49,8 @@ namespace IRaCIS.Application.Contracts public UserTypeEnum UserType { get; set; } + public string UserTypeShortName { get; set; } + public bool IsUserRoleDisabled { get; set; } [Comment("多账号信息是否已经确认")] diff --git a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs index b90851205..0a11ea4e4 100644 --- a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs @@ -74,18 +74,18 @@ namespace IRaCIS.Core.Application.Service CreateMap() .ForMember(d => d.UserType, u => u.MapFrom(t => t.UserTypeName)); - // CreateMap() - //.ForMember(d => d.RealName, u => u.MapFrom(s => s.FullName)) - //.ForMember(d => d.UserTypeId, u => u.MapFrom(s => s.UserTypeRole.Id)) - //.ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeName)) - //.ForMember(d => d.UserTypeShortName, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName)) - //.ForMember(d => d.CanEditUserType, u => u.MapFrom(s => !s.UserTrials.Any())); + // CreateMap() + //.ForMember(d => d.RealName, u => u.MapFrom(s => s.FullName)) + //.ForMember(d => d.UserTypeId, u => u.MapFrom(s => s.UserTypeRole.Id)) + //.ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeName)) + //.ForMember(d => d.UserTypeShortName, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName)) + //.ForMember(d => d.CanEditUserType, u => u.MapFrom(s => !s.UserTrials.Any())); - // CreateMap() - // .ForMember(d => d.RealName, u => u.MapFrom(s => s.FullName)) - // .ForMember(d => d.UserTypeId, u => u.MapFrom(s => s.UserTypeRole.Id)) - // .ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName)) - // .ForMember(d => d.CanEditUserType, u => u.MapFrom(s => !s.UserTrials.Any())); + // CreateMap() + // .ForMember(d => d.RealName, u => u.MapFrom(s => s.FullName)) + // .ForMember(d => d.UserTypeId, u => u.MapFrom(s => s.UserTypeRole.Id)) + // .ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName)) + // .ForMember(d => d.CanEditUserType, u => u.MapFrom(s => !s.UserTrials.Any())); var token = string.Empty; var userId = Guid.Empty; @@ -141,8 +141,9 @@ namespace IRaCIS.Core.Application.Service CreateMap() .ForMember(d => d.UserRoleId, c => c.MapFrom(t => t.Id)); - CreateMap(); - + CreateMap() + .ForMember(d => d.UserTypeShortName, c => c.MapFrom(t => t.UserTypeRole.UserTypeShortName)); + } }