diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysPermissionMapper.java b/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysPermissionMapper.java index 16b5e63f..77407a1a 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysPermissionMapper.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysPermissionMapper.java @@ -1,14 +1,15 @@ package com.jero.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.jero.modules.system.entity.SysPermission; +import com.jero.modules.system.model.TreeModel; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import com.jero.modules.system.entity.SysPermission; -import com.jero.modules.system.model.TreeModel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; /** *

@@ -53,5 +54,10 @@ public interface SysPermissionMapper extends BaseMapper { public int queryCountByUsername(@Param("username") String username, @Param("permission") SysPermission sysPermission); - + /** + * 查询二级菜单 + * @param queryWrapper + * @return + */ + List querySecondLevelMenuList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml index 71c5930c..8ccf43e3 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml @@ -88,6 +88,39 @@ ) temp - + + \ No newline at end of file diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysPermissionService.java b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysPermissionService.java index 3b984a19..a2163e97 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysPermissionService.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysPermissionService.java @@ -1,5 +1,6 @@ package com.jero.modules.system.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.exception.JeroBootException; import com.jero.modules.system.entity.SysPermission; @@ -59,4 +60,10 @@ public interface ISysPermissionService extends IService { * @return */ public boolean hasPermission(String username, String url); + + /** + * 查询二级菜单 + * @return + */ + List querySecondLevelMenuList(QueryWrapper queryWrapper); } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java index 0cd74cc1..fc9598fb 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java @@ -244,4 +244,9 @@ public class SysPermissionServiceImpl extends ServiceImpl 0; } + @Override + public List querySecondLevelMenuList(QueryWrapper queryWrapper) { + return sysPermissionMapper.querySecondLevelMenuList(queryWrapper); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java index e026e43c..06592fe2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeQuickAccessServiceImpl.java @@ -153,11 +153,12 @@ public class LawsHomeQuickAccessServiceImpl extends ServiceImpl permissionIdList = sysRolePermissionList.stream().map(SysRolePermission::getPermissionId).distinct().collect(Collectors.toList()); - sysPermissionList = sysPermissionService.list(new LambdaQueryWrapper() - .in(SysPermission::getId, permissionIdList) - .eq(SysPermission::getMenuType, 1) - .eq(SysPermission::isHidden, 0) - .eq(StringUtils.isNotBlank(menuName), SysPermission::getName, menuName)); + sysPermissionList = sysPermissionService.querySecondLevelMenuList(new QueryWrapper() + .in("p.id", permissionIdList) + .eq("p.menu_type", 1) + .eq("p.hidden", 0) + .eq(StringUtils.isNotBlank(menuName), "p.name", menuName) + .orderByAsc("p2.sort_no").orderByAsc("p.sort_no")); } } return sysPermissionList;