diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java index 881cef2..2ca5152 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java @@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.constant.Constant; import net.maku.framework.common.utils.Result; import net.maku.framework.operatelog.annotations.OperateLog; import net.maku.framework.operatelog.enums.OperateTypeEnum; @@ -71,7 +70,7 @@ public class SysMenuController { SysMenuVO vo = SysMenuConvert.INSTANCE.convert(entity); // 获取上级菜单名称 - if (!Constant.ROOT.equals(entity.getPid())) { + if (entity.getPid() != null) { SysMenuEntity parentEntity = sysMenuService.getById(entity.getPid()); vo.setParentName(parentEntity.getName()); } diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java index ae9dd9d..dc19306 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java @@ -3,10 +3,9 @@ package net.maku.system.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; -import net.maku.framework.common.constant.Constant; import net.maku.framework.common.exception.ServerException; -import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.framework.common.utils.TreeUtils; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.framework.security.user.UserDetail; import net.maku.system.convert.SysMenuConvert; import net.maku.system.dao.SysMenuDao; @@ -71,7 +70,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl getMenuList(Integer type) { List menuList = baseMapper.getMenuList(type); - return TreeUtils.build(SysMenuConvert.INSTANCE.convertList(menuList), Constant.ROOT); + return TreeUtils.build(SysMenuConvert.INSTANCE.convertList(menuList)); } @Override