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/feign/SysClient.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java index 3d7742b..20ddb06 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java @@ -21,6 +21,7 @@ import com.vci.ubcs.system.vo.DeptVO; import com.vci.ubcs.system.vo.RoleVO; import lombok.AllArgsConstructor; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; @@ -81,7 +82,7 @@ @Override @GetMapping(MENU_BUTTON) public R<List<Menu>> getMenuButtonByType(String btmType) { - return R.data(menuService.getMenuButtonByType(btmType)); + return R.data(menuService.getMenuButtonByType(btmType, AuthUtil.getUserId())); } @Override -- Gitblit v1.9.3