From 49a23c4ac5aab7876f25cd81d7b7ecdab455012e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 04 二月 2024 19:09:18 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml | 3 +++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java | 3 ++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMenuMapper.java | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java
index 92e3bbd..a957f20 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java
@@ -69,7 +69,7 @@
@GetMapping("/auth/menu")
public R userMenu() {
List<Menu> menus = roleMenuService.listMenuByUserId(getLoginUserId(), Menu.TYPE_MENU);
- return R.ok().add(Utils.toTreeData(menus, 0, Menu::getParentId, Menu::getId, Menu::setChildren));
+ return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
}
@PreAuthorize("hasAuthority('sys:auth:user')")
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMenuMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMenuMapper.java
index b4356a0..05f3edc 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMenuMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMenuMapper.java
@@ -15,6 +15,6 @@
public interface RoleMenuMapper extends BaseMapper<RoleMenu> {
@InterceptorIgnore(tenantLine = "true")
- List<Menu> listMenuByUserId(@Param("userId") Long userId, @Param("menuType") Integer menuType);
+ List<Menu> listMenuByUserId(@Param("userId") Long userId, @Param("type") Integer menuType);
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
index 37deae3..1881c3b 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
@@ -28,7 +28,8 @@
* @param <R> parentId鐨勭被鍨�
* @return List<T>
*/
- public static <T, R> List<T> toTreeData(List<T> data, R parentId,
+ public static <T, R> List<T> toTreeData(List<T> data,
+ R parentId,
Function<? super T, ? extends R> parentIdMapper,
Function<? super T, ? extends R> idMapper,
BiConsumer<T, List<T>> consumer) {
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml
index 76ac274..45048a8 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml
@@ -5,6 +5,9 @@
<select id="listMenuByUserId" resultType="com.zy.asrs.wcs.sys.entity.Menu">
select * from sys_menu
where 1=1
+ <if test="type != null">
+ AND type = #{type}
+ </if>
and id in (
select menu_id from sys_role_menu
where role_id in (
--
Gitblit v1.9.1