From 2bfad65f3f4ed0282f53e3ae01fc10c879a734bc Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 09 十一月 2023 10:03:39 +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 | 22 +++++++++++++++++++++-
1 files changed, 21 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 2aafe53..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.*;
@@ -59,15 +60,29 @@
private final ICombinationService combinationService;
+ private final IMdmCountConfigService mdmCountConfigService;
+
@Override
@GetMapping(MENU)
public R<Menu> getMenu(Long id) {
return R.data(menuService.getById(id));
}
+
+ /**
+ * 鏍规嵁code鏌ヨ鑿滃崟淇℃伅
+ * @param codes
+ * @return
+ */
+ @Override
+ @GetMapping(MENU_BY_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
@@ -241,5 +256,10 @@
return R.data(combinationService.getRegexList(combinationIds));
}
+ @Override
+ @GetMapping(MDM_COUNT_CONFIG)
+ public R<MdmCountConfig> getMdmCountConfig (String userId) {
+ return R.data(mdmCountConfigService.getMdmCountConfig(userId));
+ }
}
--
Gitblit v1.9.3