From 63013400c2790a650878445c8352992df71103b2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 19 七月 2023 11:42:59 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java | 20 +++++++++++++++++++-
1 files changed, 19 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 4480390..2aafe53 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,6 +18,8 @@
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.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
@@ -78,6 +80,15 @@
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
public R<String> getDeptIdsByFuzzy(String tenantId, String deptNames) {
@@ -137,7 +148,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) {
--
Gitblit v1.9.3