From 8fd0ad7a95d85cd09c5bf98bc0c05235a162a8af Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 16 十一月 2023 16:40:34 +0800
Subject: [PATCH] bug列表：180(分类上增加关键属性查重校验字段当前分类是否参与校验，历史数据导入代码逻辑中关键属性校验增加过滤条件)
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 4480390..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
@@ -18,7 +18,10 @@
import com.vci.ubcs.system.entity.*;
import com.vci.ubcs.system.service.*;
+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.*;
@@ -57,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
@@ -77,6 +94,15 @@
@Override
public R<String> getDeptIds(String tenantId, String deptNames) {
return R.data(deptService.getDeptIds(tenantId, deptNames));
+ }
+ @Override
+ public R<List<DeptVO>> tree(String tenantId) {
+ return R.data(deptService.tree(tenantId));
+ }
+
+ @Override
+ public R<List<DeptVO>> deptList(String tenantId) {
+ return R.data(deptService.deptList(tenantId));
}
@Override
@@ -137,7 +163,14 @@
public R<String> getRoleIds(String tenantId, String roleNames) {
return R.data(roleService.getRoleIds(tenantId, roleNames));
}
-
+ @Override
+ public R<List<RoleVO>> roleTree(String tenantId) {
+ return R.data(roleService.tree(tenantId));
+ }
+ @Override
+ public R<List<RoleVO>> roleList(String tenantId) {
+ return R.data(roleService.roleList(tenantId));
+ }
@Override
@GetMapping(ROLE_NAME)
public R<String> getRoleName(Long id) {
@@ -223,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