Bladeren bron

解决客户端菜单无法修改的问题

何力凯 1 maand geleden
bovenliggende
commit
d12caae779

+ 2 - 3
zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysMenuController.java

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

+ 1 - 10
zkqy-system/src/main/java/com/zkqy/system/service/impl/SysMenuServiceImpl.java

@@ -370,16 +370,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
     @Override
     public boolean checkMenuNameUnique(SysMenu menu) {
         Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
-        SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuNameLocale(), menu.getParentId(), menu.getTenantId());
-        if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-    @Override
-    public boolean checkMenuNameUniqueMuti(SysMenu menu) {
-        Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
-        SysMenu info = menuMapper.checkMenuNameUniqueMuti(menu.getMenuId(),menu.getMenuName(),menu.getMenuNameEn(), menu.getParentId(), menu.getTenantId());
+        SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuNameLocaleByMenuName(), menu.getParentId(), menu.getTenantId());
         if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }