|
@@ -75,7 +75,7 @@ public class SysMenuController extends BaseController {
|
|
@PostMapping
|
|
@PostMapping
|
|
public AjaxResult add(@Validated @RequestBody SysMenu menu) {
|
|
public AjaxResult add(@Validated @RequestBody SysMenu menu) {
|
|
menu.setMenuNameByMenuNameLocale();
|
|
menu.setMenuNameByMenuNameLocale();
|
|
- if (!menuService.checkMenuNameUniqueMuti(menu)) {
|
|
|
|
|
|
+ if (!menuService.checkMenuNameUnique(menu)) {
|
|
return error("新增菜单'" + menu.getMenuNameLocale() + "'失败,菜单名称已存在");
|
|
return error("新增菜单'" + menu.getMenuNameLocale() + "'失败,菜单名称已存在");
|
|
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
|
|
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
|
|
return error("新增菜单'" + menu.getMenuNameLocale() + "'失败,地址必须以http(s)://开头");
|
|
return error("新增菜单'" + menu.getMenuNameLocale() + "'失败,地址必须以http(s)://开头");
|
|
@@ -97,8 +97,7 @@ public class SysMenuController extends BaseController {
|
|
@Log(title = "菜单管理", businessType = BusinessType.UPDATE)
|
|
@Log(title = "菜单管理", businessType = BusinessType.UPDATE)
|
|
@PutMapping
|
|
@PutMapping
|
|
public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
|
|
public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
|
|
- menu.setMenuNameByMenuNameLocale();
|
|
|
|
- if (!menuService.checkMenuNameUniqueMuti(menu)) {
|
|
|
|
|
|
+ if (!menuService.checkMenuNameUnique(menu)) {
|
|
return error("修改菜单'" + menu.getMenuNameLocale() + "'失败,菜单名称已存在");
|
|
return error("修改菜单'" + menu.getMenuNameLocale() + "'失败,菜单名称已存在");
|
|
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
|
|
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
|
|
return error("修改菜单'" + menu.getMenuNameLocale() + "'失败,地址必须以http(s)://开头");
|
|
return error("修改菜单'" + menu.getMenuNameLocale() + "'失败,地址必须以http(s)://开头");
|