From 158ac9bdc5d184a4dca8ff30755186f5ca2db771 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 30 十月 2023 11:58:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleMenuServiceImpl.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleMenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleMenuServiceImpl.java
index d596d8e..dc02fbd 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleMenuServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleMenuServiceImpl.java
@@ -53,20 +53,14 @@
private IUserClient userClient;
/**
- * 鏍规嵁鐢ㄦ埛id鏌ヨ锛岃鎺堟潈鐨勮彍鍗昳d
+ * 鏍规嵁鐢ㄦ埛id鏌ヨ瑙掕壊id锛屽啀鏌ヨ琚巿鏉冪殑鑿滃崟id
* @param userId
* @return
*/
@Override
public List<Long> getMenuIdByUserId(Long userId) {
- // 鏍规嵁鐢ㄦ埛id鏌ヨ鑿滃崟id
- R<User> userR = userClient.userInfoById((Func.isEmpty(userId) ? AuthUtil.getUserId():userId));
- if (!userR.isSuccess() || Func.isEmpty(userR.getData())) {
- throw new ServiceException("鐢ㄦ埛淇℃伅鏌ヨ澶辫触,鍘熷洜锛�"+userR.getMsg());
- }
-
// 褰撴煡璇㈡潯浠秈n澶т簬涓�鍗冩潯鏃�
- List<String> roleIdList = Func.toStrList(userR.getData().getRoleId());
+ List<String> roleIdList = Func.toStrList(AuthUtil.getUser().getRoleId());
//鏋勫缓鏌ヨ鑿滃崟id鐨勬煡璇㈡潯浠�
LambdaQueryWrapper<RoleMenu> roleMenuWrapper = Wrappers.<RoleMenu>query()
.lambda().select(RoleMenu::getMenuId);
--
Gitblit v1.9.3