From abb8a06f4ce82ad8eec8609d89fc2e461186c031 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Fri, 26 Jul 2024 11:45:37 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5-?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=96=B9=E5=BC=8F=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/mapper/xml/SysPermissionMapper.xml        |  1 +
 .../service/impl/LawsHomeQuickAccessServiceImpl.java | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

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}
 	</select>
 
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<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;