update:修改首页-快捷方式的查询

2024-07-26 11:45:37 +08:00
parent 3f874d30be
commit abb8a06f4c
2 changed files with 7 additions and 6 deletions
@@ -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}
 	</select>

@@ -150,12 +150,12 @@ public class LawsHomeQuickAccessServiceImpl extends ServiceImpl<LawsHomeQuickAcc
 							.in(SysRolePermission::getRoleId, roleIdList));
 			if (!sysRolePermissionList.isEmpty()){
 				List<String> permissionIdList = sysRolePermissionList.stream().map(SysRolePermission::getPermissionId).distinct().collect(Collectors.toList());
-				sysPermissionList = sysPermissionService.querySecondLevelMenuList(new QueryWrapper<SysPermission>()
-						.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<SysPermission>()
+						.in("id", permissionIdList)
+						.isNotNull("home_icon")
+						.ne("home_icon", "")
+						.eq(StringUtils.isNotBlank(menuName), "name", menuName)
+						.orderByAsc("sort_no"));
 			}
 		}
 		return sysPermissionList;