From bde9fd85641630fe232ba512aba26cf91cb0bc9f Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期二, 05 八月 2025 10:23:47 +0800 Subject: [PATCH] fix:bug --- FlexJobApi.User.Application/Menus/Commands/SaveMenuCommandHandler.cs | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/FlexJobApi.User.Application/Menus/Commands/SaveMenuCommandHandler.cs b/FlexJobApi.User.Application/Menus/Commands/SaveMenuCommandHandler.cs index 7b1a417..59550fc 100644 --- a/FlexJobApi.User.Application/Menus/Commands/SaveMenuCommandHandler.cs +++ b/FlexJobApi.User.Application/Menus/Commands/SaveMenuCommandHandler.cs @@ -32,7 +32,7 @@ if (request.Id.HasValue) { var entity = await rep.AsQueryable() - .Include(it => it.Childrens) + .Include(it => it.Children) .FirstOrDefaultAsync(it => it.Id == request.Id, cancellationToken); if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, "鑿滃崟"); if (entity.UserType != request.UserType) throw Oops.Oh(EnumErrorCodeType.s410, "鐢ㄦ埛绫诲瀷"); @@ -71,11 +71,13 @@ // 鑾峰彇瀛愰泦Id var childrenIds = GetRequestChildrenIds(request); // 鍒犻櫎瀛愮骇 - entity.Childrens = entity.Childrens.Where(it => - it.Type == EnumMenuType.Menu - || it.Type == EnumMenuType.Page - || it.Type == EnumMenuType.Modal - || childrenIds.Contains(it.Id)).ToList(); + entity.Children = entity.Children + .Where(it => + it.Type == EnumMenuType.Menu + || it.Type == EnumMenuType.Page + || it.Type == EnumMenuType.Modal + || childrenIds.Contains(it.Id)) + .ToList(); // 閬嶅巻鍒嗙粍 @@ -87,7 +89,7 @@ // 閬嶅巻鎸夐挳 娣诲姞鎴栨洿鏂� foreach (var button in buttonLocation.Buttons) { - var buttonEntity = entity.Childrens.FirstOrDefault(it => it.Id == button.Id); + var buttonEntity = entity.Children.FirstOrDefault(it => it.Id == button.Id); if (buttonEntity == null) { if (button.Id.HasValue) throw Oops.Oh(EnumErrorCodeType.s404, $"褰撳墠鍒嗙粍{group.Group}-浣嶇疆{buttonLocation.Location}-鎸夐挳{button.Code}"); @@ -96,8 +98,9 @@ UserType = entity.UserType, ClientType = entity.ClientType, Type = EnumMenuType.Button, + VisitLevel = entity.VisitLevel, }; - entity.Childrens.Add(buttonEntity); + entity.Children.Add(buttonEntity); } else if (buttonEntity.Type != EnumMenuType.Button) throw Oops.Oh(EnumErrorCodeType.s400, $"褰撳墠鍒嗙粍{group.Group}-瀛楁{button.Code}骞堕潪涓�涓寜閽�"); buttonEntity.Path = $"{entity.Path}{entity.Code}/"; @@ -110,7 +113,7 @@ // 閬嶅巻瀛楁 娣诲姞鎴栨洿鏂� foreach (var field in group.Fields) { - var fieldEntity = entity.Childrens.FirstOrDefault(it => it.Id == field.Id); + var fieldEntity = entity.Children.FirstOrDefault(it => it.Id == field.Id); if (fieldEntity == null) { if (field.Id.HasValue) throw Oops.Oh(EnumErrorCodeType.s404, $"褰撳墠鍒嗙粍{group.Group}-瀛楁{field.Code}"); @@ -119,8 +122,9 @@ UserType = entity.UserType, ClientType = entity.ClientType, Type = EnumMenuType.Field, + VisitLevel = entity.VisitLevel, }; - entity.Childrens.Add(fieldEntity); + entity.Children.Add(fieldEntity); } else if (fieldEntity.Type != EnumMenuType.Field) throw Oops.Oh(EnumErrorCodeType.s400, $"褰撳墠鍒嗙粍{group.Group}-浣嶇疆{fieldEntity.Location}-鎸夐挳{fieldEntity.Code}骞堕潪涓�涓瓧娈�"); fieldEntity.Path = $"{entity.Path}{entity.Code}/"; @@ -137,7 +141,7 @@ /// <param name="entity"></param> private void CheckRepeatChildrens(Menu entity) { - var repeats = entity.Childrens + var repeats = entity.Children .GroupBy(it => { return it.Type == EnumMenuType.Button -- Gitblit v1.9.1