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 e78ea655..434178ed 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 @@ -51,7 +51,16 @@ public interface IDeptClient { @GetMapping(TOP) List getUserDeptNode(@RequestParam("deptId") Long deptId); + /** + * 查询用户下的所有子节点 + * + * @param deptId 用户部门ID + * @return BladePage + */ + @GetMapping(API_PREFIX + "/findNameById") + String findNameById(@RequestParam("deptId") Long deptId); - + @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 72be8dd0..06fccfeb 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 @@ -17,6 +17,7 @@ package org.springblade.system.feign; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; import org.springblade.core.tenant.annotation.NonDS; @@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import java.util.List; +import java.util.Objects; /** @@ -49,4 +51,27 @@ public class DeptClient implements IDeptClient { List deptChild = service.getMyDeptNode(deptId); return deptChild; } + + @Override + public String findNameById(Long deptId) { + Dept dept = service.getById(deptId); + if(!Objects.isNull(dept)){ + return dept.getDeptName(); + } + return null; + } + + @Override + public Long findIdByName(String deptName) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("dept_name",deptName) + .eq("is_deleted",0); + Dept dept = service.getOne(queryWrapper); + + + if(!Objects.isNull(dept)){ + return dept.getId(); + } + return null; + } }