Răsfoiți Sursa

fix: 菜单检测子菜单

jay 2 ani în urmă
părinte
comite
51af01c1ec

+ 1 - 1
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysMenuDataImpl.java

@@ -193,7 +193,7 @@ public class SysMenuDataImpl implements ISysMenuData, IJPACommData<SysMenu, Long
     @Override
     public boolean hasChildByMenuId(Long menuId) {
         TbSysMenu tbSysMenu = jpaQueryFactory.select(QTbSysMenu.tbSysMenu).from(QTbSysMenu.tbSysMenu)
-                .where(QTbSysMenu.tbSysMenu.parentId.eq(menuId)).fetchOne();
+                .where(QTbSysMenu.tbSysMenu.parentId.eq(menuId)).limit(1).fetchOne();
         return Objects.nonNull(tbSysMenu);
     }
 

+ 1 - 1
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysMenuController.java

@@ -144,7 +144,7 @@ public class SysMenuController extends BaseController {
             fail("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
         } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
             fail("修改菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
-        } else if (menu.getMenuId().equals(menu.getParentId())) {
+        } else if (menu.getId().equals(menu.getParentId())) {
             fail("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己");
         }
         menuService.updateMenu(menu);

+ 1 - 1
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysMenuBo.java

@@ -27,7 +27,7 @@ public class SysMenuBo extends BaseDto {
      * 菜单ID
      */
     @NotNull(message = "菜单ID不能为空", groups = { EditGroup.class })
-    private Long menuId;
+    private Long id;
 
     /**
      * 父菜单ID