From abfe801623180293dea60e4117024901cf471991 Mon Sep 17 00:00:00 2001
From: mazhichao <samurai@88.com>
Date: Thu, 25 Mar 2021 14:05:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E9=83=A8=E9=97=A8=E9=80=9A=E8=BF=87feign=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/common/system/api/ISysBaseAPI.java   |  2 ++
 .../api/controller/SystemAPIController.java   | 29 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java b/jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java
index 5644f7ce..f00b0b39 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java
@@ -425,6 +425,7 @@ public interface ISysBaseAPI extends CommonAPI {
      * @param departId 部门id
      * @return JSONObject
      */
+    @GetMapping("/sys/api/listParentDepartsByDepId")
     List<SysDepartTreeModel> listParentDepartsByDepId(@RequestParam("departId") String departId);
 
     /**
@@ -434,6 +435,7 @@ public interface ISysBaseAPI extends CommonAPI {
      * @param departId 部门id
      * @return JSONObject
      */
+    @GetMapping("/sys/api/listSonDepartsByDepId")
     List<SysDepartTreeModel> listSonDepartsByDepId(@RequestParam("departId") String departId);
 
 
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/api/controller/SystemAPIController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/api/controller/SystemAPIController.java
index 5f6488d6..c77c346f 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/api/controller/SystemAPIController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/api/controller/SystemAPIController.java
@@ -5,6 +5,7 @@ import com.jero.common.api.dto.OnlineAuthDTO;
 import com.jero.common.api.dto.message.*;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.*;
+import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +27,8 @@ public class SystemAPIController {
     @Autowired
     private ISysUserService sysUserService;
 
-
+    @Autowired
+    private ISysDepartService sysDepartService;
     /**
      * 发送系统消息
      * @param message 使用构造器赋值参数 如果不设置category(消息类型)则默认为2 发送系统消息
@@ -521,4 +523,29 @@ public class SystemAPIController {
     public void sendEmailMsg(@RequestParam("email")String email,@RequestParam("title")String title,@RequestParam("content")String content){
          this.sysBaseAPI.sendEmailMsg(email,title,content);
     };
+    /**
+     * 根据部门id查询部门所有的父级(不包含自己)
+     * @author 马志朝
+     * @date 2021/3/24 8:50
+     * @param departId 部门id
+     */
+    @GetMapping("/listParentDepartsByDepId")
+    List<SysDepartTreeModel> listParentDepartsByDepId(@RequestParam("departId") String departId){
+        return sysDepartService.listParentDepartsByDepId(departId);
+    }
+
+    @GetMapping("/listSonDepartsByDepId")
+    /**
+     * 根据部门id查询部门所有的子级(不包含自己)
+     * @author 马志朝
+     * @date 2021/3/24 8:54
+     * @param departId 部门id
+     */
+    List<SysDepartTreeModel> listSonDepartsByDepId(@RequestParam("departId") String departId){
+        return sysDepartService.listSonDepartsByDepId(departId);
+    }
+
+
+
+
 }