|
|
@ -126,11 +126,11 @@ public class SysMenuController extends BaseController
|
|
|
|
else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
|
|
|
|
else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
|
|
|
|
&& !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
|
|
|
|
&& !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
|
|
|
|
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (menu.getMenuId().equals(menu.getParentId()))
|
|
|
|
else if (menu.getMenuId().equals(menu.getParentId()))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己");
|
|
|
|
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
menu.setUpdateBy(SecurityUtils.getUsername());
|
|
|
|
menu.setUpdateBy(SecurityUtils.getUsername());
|
|
|
|
return toAjax(menuService.updateMenu(menu));
|
|
|
|
return toAjax(menuService.updateMenu(menu));
|
|
|
|