From c99438c64037b06c629e37f1f1acb5ce48a31036 Mon Sep 17 00:00:00 2001 From: 17808 <1780814303@qq.com> Date: 星期三, 13 九月 2023 13:05:38 +0800 Subject: [PATCH] Merge branch 'lyl-dev' --- ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java index 685f7f3..e7c46e0 100644 --- a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java +++ b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java @@ -2,12 +2,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.dto.UmsMenuNode; import com.ycl.entity.user.UmsMenu; import com.ycl.entity.user.UmsResource; import com.ycl.entity.user.UmsRole; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; /** * 鍚庡彴瑙掕壊绠$悊Service @@ -32,7 +34,10 @@ /** * 鏍规嵁绠$悊鍛業D鑾峰彇瀵瑰簲鑿滃崟 */ - List<UmsMenu> getMenuList(Long adminId); + List<UmsMenuNode> getMenuList(Long adminId); + + + List<UmsRole> getRoleListByCodes(List<String> codes); /** * 鑾峰彇瑙掕壊鐩稿叧鑿滃崟 -- Gitblit v1.8.0