|
|
@@ -25,12 +25,12 @@ namespace Hotline.Application.Mappers
|
|
|
.Map(d => d.Name, x => x.Name ?? x.UserName);
|
|
|
|
|
|
config.NewConfig<User, UserDto>()
|
|
|
+ .IgnoreIf((s, d) => s.Account == null, d => d.UserName, d => d.Roles)
|
|
|
+ .IgnoreIf((s, d) => s.Organization == null, d => d.OrgName)
|
|
|
.Map(d => d.UserName, x => x.Account.UserName)
|
|
|
.Map(d => d.OrgName, x => x.Organization.OrgName)
|
|
|
.Map(d => d.Roles, x => string.Join(',', x.Account.Roles.Select(d => d.DisplayName)))
|
|
|
.Map(d => d.State, x => x.IsDeleted ? "已删除" : "正常")
|
|
|
- .IgnoreIf((s, d) => s.Account == null, d => d.UserName)
|
|
|
- .IgnoreIf((s, d) => s.Account == null, d => d.Roles)
|
|
|
.IgnoreNullValues(true);
|
|
|
|
|
|
config.NewConfig<Role, RoleDto>()
|
|
|
@@ -64,7 +64,6 @@ namespace Hotline.Application.Mappers
|
|
|
.Ignore(d => d.Workflow.Definition)
|
|
|
.Ignore(d => d.Workflow.StepBoxes)
|
|
|
.Ignore(d => d.Workflow.Traces)
|
|
|
- .Ignore(d => d.Workflow.Supplements)
|
|
|
;
|
|
|
|
|
|
config.ForType<AddOrderDto, Order>()
|
xf