From ca3562768e3c7c29a7d62003a08760b72188d2df Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 20 Feb 2024 15:10:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E6=A0=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/system/feign/IDeptClient.java | 8 ++++++++ .../java/org/springblade/system/feign/DeptClient.java | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/IDeptClient.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/IDeptClient.java index 434178ed..752e33be 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/IDeptClient.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/IDeptClient.java @@ -19,6 +19,7 @@ package org.springblade.system.feign; import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.mp.support.BladePage; import org.springblade.system.entity.Dept; +import org.springblade.system.vo.DeptVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -60,6 +61,13 @@ public interface IDeptClient { @GetMapping(API_PREFIX + "/findNameById") String findNameById(@RequestParam("deptId") Long deptId); + /** + * 查询部门组织树 + * @return BladePage + */ + @GetMapping(API_PREFIX + "/getDeptTree") + List getDeptTree(@RequestParam("tenantId") String tenantId); + @GetMapping(API_PREFIX + "/findIdByName") Long findIdByName(@RequestParam("deptName") String deptName); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/DeptClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/DeptClient.java index 06fccfeb..972383ec 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/DeptClient.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/DeptClient.java @@ -23,6 +23,7 @@ import org.springblade.core.mp.support.BladePage; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.system.entity.Dept; import org.springblade.system.service.IDeptService; +import org.springblade.system.vo.DeptVO; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -61,6 +62,15 @@ public class DeptClient implements IDeptClient { return null; } + @Override + public List getDeptTree(String tenantId) { + List tree = service.tree(tenantId); + if(!Objects.isNull(tree)){ + return tree; + } + return null; + } + @Override public Long findIdByName(String deptName) { QueryWrapper queryWrapper = new QueryWrapper<>();