From 3087e3b9c63e8821fa866329dc382c800f37afbc Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 8 Jan 2024 17:53:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83):=2080?=
 =?UTF-8?q?180?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/mapper/SysPermissionMapper.java    | 18 ++++++----
 .../system/mapper/xml/SysPermissionMapper.xml | 35 ++++++++++++++++++-
 .../system/service/ISysPermissionService.java |  7 ++++
 .../impl/SysPermissionServiceImpl.java        |  5 +++
 .../impl/LawsHomeQuickAccessServiceImpl.java  | 11 +++---
 5 files changed, 64 insertions(+), 12 deletions(-)

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;
 
 /**
  * <p>
@@ -53,5 +54,10 @@ public interface SysPermissionMapper extends BaseMapper<SysPermission> {
 	public int queryCountByUsername(@Param("username") String username, @Param("permission") SysPermission sysPermission);
 
 
-
+	/**
+	 * 查询二级菜单
+	 * @param queryWrapper
+	 * @return
+	 */
+    List<SysPermission> querySecondLevelMenuList(@Param(Constants.WRAPPER) QueryWrapper<SysPermission> 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 @@
 			</if>
 		) temp
 	</select>
-	
+
+	<select id="querySecondLevelMenuList" resultType="com.jero.modules.system.entity.SysPermission">
+		SELECT p.id,
+			   p.parent_id,
+			   p.name,
+			   p.url,
+			   p.component,
+			   p.component_name,
+			   p.redirect,
+			   p.menu_type,
+			   p.perms,
+			   p.perms_type,
+			   p.sort_no,
+			   p.always_show,
+			   p.icon,
+			   p.is_route,
+			   p.is_leaf,
+			   p.keep_alive,
+			   p.hidden,
+			   p.description,
+			   p.create_by,
+			   p.create_time,
+			   p.update_by,
+			   p.update_time,
+			   p.del_flag,
+			   p.rule_flag,
+			   p.status,
+			   p.internal_or_external,
+			   p.menu_en,
+			   p.app_id
+		FROM sys_permission p
+				 INNER JOIN sys_permission p2 ON p.parent_id = p2.id
+			${ew.customSqlSegment}
+	</select>
 
 </mapper>
\ 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<SysPermission> {
 	 * @return
 	 */
 	public boolean hasPermission(String username, String url);
+
+	/**
+	 * 查询二级菜单
+	 * @return
+	 */
+    List<SysPermission> querySecondLevelMenuList(QueryWrapper<SysPermission> 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<SysPermissionMapper, S
 		return count > 0;
 	}
 
+	@Override
+	public List<SysPermission> querySecondLevelMenuList(QueryWrapper<SysPermission> 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<LawsHomeQuickAcc
 							.in(SysRolePermission::getRoleId, roleIdList));
 			if (!sysRolePermissionList.isEmpty()){
 				List<String> permissionIdList = sysRolePermissionList.stream().map(SysRolePermission::getPermissionId).distinct().collect(Collectors.toList());
-				sysPermissionList = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>()
-						.in(SysPermission::getId, permissionIdList)
-						.eq(SysPermission::getMenuType, 1)
-						.eq(SysPermission::isHidden, 0)
-						.eq(StringUtils.isNotBlank(menuName), SysPermission::getName, menuName));
+				sysPermissionList = sysPermissionService.querySecondLevelMenuList(new QueryWrapper<SysPermission>()
+						.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;