syy/SYYTe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化菜单逻辑

This commit is contained in:
阿沐 2023-10-06 15:46:00 +08:00
parent 43d828e7d0
commit d9a1fe28eb
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java
View File

@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import net.maku.framework.common.constant.Constant;
import net.maku.framework.common.utils.Result; import net.maku.framework.common.utils.Result;
import net.maku.framework.operatelog.annotations.OperateLog; import net.maku.framework.operatelog.annotations.OperateLog;
import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.framework.operatelog.enums.OperateTypeEnum;
@ -71,7 +70,7 @@ public class SysMenuController {
SysMenuVO vo = SysMenuConvert.INSTANCE.convert(entity); SysMenuVO vo = SysMenuConvert.INSTANCE.convert(entity);
// 获取上级菜单名称 // 获取上级菜单名称
if (!Constant.ROOT.equals(entity.getPid())) { if (entity.getPid() != null) {
SysMenuEntity parentEntity = sysMenuService.getById(entity.getPid()); SysMenuEntity parentEntity = sysMenuService.getById(entity.getPid());
vo.setParentName(parentEntity.getName()); vo.setParentName(parentEntity.getName());
} }

5
maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java
View File

@ -3,10 +3,9 @@ package net.maku.system.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import net.maku.framework.common.constant.Constant;
import net.maku.framework.common.exception.ServerException; 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.common.utils.TreeUtils;
import net.maku.framework.mybatis.service.impl.BaseServiceImpl;
import net.maku.framework.security.user.UserDetail; import net.maku.framework.security.user.UserDetail;
import net.maku.system.convert.SysMenuConvert; import net.maku.system.convert.SysMenuConvert;
import net.maku.system.dao.SysMenuDao; import net.maku.system.dao.SysMenuDao;
@ -71,7 +70,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuDao, SysMenuEntit
public List<SysMenuVO> getMenuList(Integer type) { public List<SysMenuVO> getMenuList(Integer type) {
List<SysMenuEntity> menuList = baseMapper.getMenuList(type); List<SysMenuEntity> menuList = baseMapper.getMenuList(type);
return TreeUtils.build(SysMenuConvert.INSTANCE.convertList(menuList), Constant.ROOT); return TreeUtils.build(SysMenuConvert.INSTANCE.convertList(menuList));
} }
@Override @Override