diff --git a/ZR.Model/System/Dto/RoleMenuExportDto.cs b/ZR.Model/System/Dto/RoleMenuExportDto.cs index 9145137..b2e83ea 100644 --- a/ZR.Model/System/Dto/RoleMenuExportDto.cs +++ b/ZR.Model/System/Dto/RoleMenuExportDto.cs @@ -21,10 +21,9 @@ namespace ZR.Model.System.Dto public string Component { get; set; } [ExcelColumn(Name = "权限字符", Width = 20)] public string Perms { get; set; } - //[ExcelColumn(Name = "菜单类型")] - //[SqlSugar.SugarColumn(SqlParameterDbType = typeof(EnumToStringConvert))] - //public MenuType MenuType { get; set; } - //[ExcelColumn(Name = "菜单状态")] - //public MenuStatus Status { get; set; } + [ExcelColumn(Name = "菜单类型")] + public MenuType MenuType { get; set; } + [ExcelColumn(Name = "菜单状态")] + public MenuStatus Status { get; set; } } } diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs index 7db43f3..2e62576 100644 --- a/ZR.Service/System/SysMenuService.cs +++ b/ZR.Service/System/SysMenuService.cs @@ -251,13 +251,11 @@ namespace ZR.Service .Select((t1, t2, t3) => new RoleMenuExportDto() { MenuName = $"{t1.MenuName}->{t2.MenuName}->{t3.MenuName}", - //MenuName1 = t2.MenuName, - //MenuName2 = t3.MenuName, Path = t2.Path, Component = t2.Component, Perms = t3.Perms, - //MenuType = (MenuType)Enum.Parse(typeof(MenuType), t3.MenuType) //(MenuType)t3.MenuType, - //Status = t3.Status + MenuType = (MenuType)(object)t3.MenuType, + Status = (MenuStatus)(object)t3.Status }).ToList(); }