From c64f772faee62ffa93a02e9e5d23bc69fccad10c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 10 Mar 2022 10:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BB=A3=E7=A0=81=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-admin/pom.xml                          |  6 ++++++
 .../esua/epdc/controller/SysDeptController.java   | 15 +++++++++++++++
 .../java/com/elink/esua/epdc/dao/SysDeptDao.java  | 10 ++++++++++
 .../elink/esua/epdc/service/SysDeptService.java   | 10 ++++++++++
 .../epdc/service/impl/SysDeptServiceImpl.java     |  5 +++++
 .../src/main/resources/mapper/SysDeptDao.xml      | 11 +++++++++++
 epdc-cloud-client-yushan                          |  2 +-
 epdc-cloud-commons-yushan                         |  2 +-
 8 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-admin/pom.xml b/epdc-cloud-admin/pom.xml
index f9ddb4e..494e6d6 100644
--- a/epdc-cloud-admin/pom.xml
+++ b/epdc-cloud-admin/pom.xml
@@ -108,6 +108,12 @@
             <artifactId>epdc-cloud-analysis-client</artifactId>
             <version>${epdc-cloud-client.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc.yushan</groupId>
+            <artifactId>epdc-optimize-department</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
index e559761..407d761 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
@@ -358,4 +358,19 @@ public class SysDeptController {
         return sysDeptService.addAreaCode(dto);
     }
 
+    /**
+     * 根据机构类型获取机构数据
+     *
+     * @param typeKey 机构类型
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
+     * @author Liuchuang
+     * @since 2021/1/20 9:58
+     */
+    @GetMapping("getdeptinfo/{typeKey}")
+    public Result<List<SysDeptDTO>> getDeptInfoByTypeKey(@PathVariable String typeKey) {
+        List<SysDeptDTO> data = sysDeptService.listOfDeptInfoByTypeKey(typeKey);
+
+        return new Result<List<SysDeptDTO>>().ok(data);
+    }
+
 }
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
index a1d9e8b..9d89557 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
@@ -201,4 +201,14 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @Date: 2020-04-14
      */
     List<UserSysDeptInfoResultDTO> selectListAllDeptInfo(Map<String, Object> map);
+
+    /**
+     * 根据机构类型获取机构数据
+     *
+     * @param typeKey 机构类型
+     * @return java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
+     * @author Liuchuang
+     * @since 2021/1/20 10:01
+     */
+    List<SysDeptDTO> selectListOfDeptInfoByTypeKey(String typeKey);
 }
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index 52b289a..24d32c5 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -282,4 +282,14 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @since 2021/5/11 15:21
      */
     Result<SysDeptDTO> addAreaCode(SysDeptDTO dto);
+
+    /**
+     * 根据机构类型获取机构数据
+     *
+     * @param typeKey 机构类型
+     * @return java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
+     * @author Liuchuang
+     * @since 2021/1/20 9:59
+     */
+    List<SysDeptDTO> listOfDeptInfoByTypeKey(String typeKey);
 }
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index bda23c4..b78880b 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -1130,4 +1130,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
 
         return new Result<SysDeptDTO>().ok(dto);
     }
+
+    @Override
+    public List<SysDeptDTO> listOfDeptInfoByTypeKey(String typeKey) {
+        return baseDao.selectListOfDeptInfoByTypeKey(typeKey);
+    }
 }
diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
index 0779b5c..c66900c 100644
--- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
@@ -335,4 +335,15 @@
             AND sd.NAME = #{deptName}
         </if>
     </select>
+
+    <select id="selectListOfDeptInfoByTypeKey" resultType="com.elink.esua.epdc.dto.SysDeptDTO">
+        SELECT
+            *
+        FROM
+            sys_dept t
+        WHERE
+            t.del_flag = 0
+          AND type_key = #{typeKey}
+          AND t.id NOT IN ( SELECT c.dept_id FROM sys_dept_config c WHERE c.del_flag = '0' ) ORDER BY t.`name`
+    </select>
 </mapper>
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 5229abd..c8919c0 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 5229abdeb550da65d884acdca5e9d90476cd3f0e
+Subproject commit c8919c0138cc614ccd30b1d50cde3aa0012ec084
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 128c6a4..65a8a48 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a
+Subproject commit 65a8a48f22d1c0e2daad74c1e52f82ae8847dfad