From b446560ccc97aedde9917db2273c6c6fb8b71acb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 14 一月 2024 17:05:29 +0800
Subject: [PATCH] 277:参照配置界面，关于包含条件，同一个字段具备多个包含条件时，需要重新设置一下界面更改一下后端查询接口
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 1816a69..f96ff31 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.*;
@@ -61,6 +62,8 @@
private final IMdmCountConfigService mdmCountConfigService;
+ private final IClassifyAuthService classifyAuthService;
+
@Override
@GetMapping(MENU)
public R<Menu> getMenu(Long id) {
@@ -74,14 +77,14 @@
*/
@Override
@GetMapping(MENU_BY_CODES)
- public R<List<Menu>> getMenuByCodes(List<String> codes) {
- return R.data(menuService.getMenuByCodes(codes));
+ public R<List<Menu>> getMenuByCodes(List<String> codes,Long userId) {
+ return R.data(menuService.getMenuByCodes(codes,userId));
}
@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
@@ -261,4 +264,8 @@
return R.data(mdmCountConfigService.getMdmCountConfig(userId));
}
+ public R<List<String>> getViewClassByRoleIds(List<String> roleIds){
+ return R.data(classifyAuthService.getViewClassByRoleIds(roleIds));
+ }
+
}
--
Gitblit v1.9.3