From d9fe4c2d64339fc799e47e1b5a297f349acd59c6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 18 一月 2024 09:56:16 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 f96ff31..3167d45 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
@@ -83,8 +83,8 @@
@Override
@GetMapping(MENU_BUTTON)
- public R<List<Menu>> getMenuButtonByType(String btmType) {
- return R.data(menuService.getMenuButtonByType(btmType, AuthUtil.getUserId()));
+ public R<List<Menu>> getMenuButtonByType(String classifyId,String btmType,String authType) {
+ return R.data(menuService.getMenuButtonByType(classifyId,btmType,authType));
}
@Override
@@ -264,8 +264,8 @@
return R.data(mdmCountConfigService.getMdmCountConfig(userId));
}
- public R<List<String>> getViewClassByRoleIds(List<String> roleIds){
- return R.data(classifyAuthService.getViewClassByRoleIds(roleIds));
+ public R<List<String>> getViewClassByRoleIds(List<String> roleIds,String authType,String menuCode){
+ return R.data(classifyAuthService.getViewClassByRoleIds(roleIds,authType,menuCode));
}
}
--
Gitblit v1.9.3