|
@@ -160,12 +160,16 @@ namespace Hotline.Api.Controllers
|
|
var menu = await _systemMenuRepository.GetAsync(id, HttpContext.RequestAborted);
|
|
var menu = await _systemMenuRepository.GetAsync(id, HttpContext.RequestAborted);
|
|
if (menu is null)
|
|
if (menu is null)
|
|
throw UserFriendlyException.SameMessage("无效菜单");
|
|
throw UserFriendlyException.SameMessage("无效菜单");
|
|
|
|
+ //检查是否存在下级菜单
|
|
|
|
+ var ishavemenu = await _systemMenuRepository.AnyAsync(x => x.ParentId == id);
|
|
|
|
+ if (ishavemenu)
|
|
|
|
+ throw UserFriendlyException.SameMessage("存在下级菜单,暂时不能删除");
|
|
//检查是否存在按钮
|
|
//检查是否存在按钮
|
|
- var ishave = await _systemButtonRepository.AnyAsync(x => x.MenuId == id);
|
|
|
|
- if (ishave)
|
|
|
|
|
|
+ var ishavebutton = await _systemButtonRepository.AnyAsync(x => x.MenuId == id);
|
|
|
|
+ if (ishavebutton)
|
|
throw UserFriendlyException.SameMessage("存在按钮权限,暂时不能删除");
|
|
throw UserFriendlyException.SameMessage("存在按钮权限,暂时不能删除");
|
|
|
|
|
|
- await _systemMenuRepository.RemoveAsync(id, true, HttpContext.RequestAborted);
|
|
|
|
|
|
+ await _systemMenuRepository.RemoveAsync(id, false, HttpContext.RequestAborted);
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -238,7 +242,7 @@ namespace Hotline.Api.Controllers
|
|
var button = await _systemButtonRepository.GetAsync(id, HttpContext.RequestAborted);
|
|
var button = await _systemButtonRepository.GetAsync(id, HttpContext.RequestAborted);
|
|
if (button is null)
|
|
if (button is null)
|
|
throw UserFriendlyException.SameMessage("无效按钮");
|
|
throw UserFriendlyException.SameMessage("无效按钮");
|
|
- await _systemButtonRepository.RemoveAsync(id, true, HttpContext.RequestAborted);
|
|
|
|
|
|
+ await _systemButtonRepository.RemoveAsync(id, false, HttpContext.RequestAborted);
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|