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 bfa9e131..75364f19 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 @@ -120,6 +120,7 @@ p.app_id, p.home_icon FROM sys_permission p + INNER JOIN sys_permission p2 ON p.parent_id = p2.id ${ew.customSqlSegment} 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 a12b38f4..a72441a8 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 @@ -150,12 +150,12 @@ public class LawsHomeQuickAccessServiceImpl extends ServiceImpl permissionIdList = sysRolePermissionList.stream().map(SysRolePermission::getPermissionId).distinct().collect(Collectors.toList()); - sysPermissionList = sysPermissionService.querySecondLevelMenuList(new QueryWrapper() - .in("p.id", permissionIdList) - .isNotNull("p.home_icon") - .ne("p.home_icon", "") - .eq(StringUtils.isNotBlank(menuName), "p.name", menuName) - .orderByAsc("p.sort_no")); + sysPermissionList = sysPermissionService.list(new QueryWrapper() + .in("id", permissionIdList) + .isNotNull("home_icon") + .ne("home_icon", "") + .eq(StringUtils.isNotBlank(menuName), "name", menuName) + .orderByAsc("sort_no")); } } return sysPermissionList;