From b92b87a6baa3bbdbcc89ca3ed9469f95bbb9619b Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Fri, 12 Nov 2021 17:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfaces/department/IDepartmentBaseService.java    | 9 +++++++++
 .../service/department/impl/DepartmentServiceImpl.java   | 8 ++++++++
 .../department/service/impl/DepartmentServiceImpl.java   | 8 ++++++++
 .../main/resources/mybatis/mapper/department-mapper.xml  | 4 ++++
 4 files changed, 29 insertions(+)

diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentBaseService.java
index 5face5c8..d86f24a2 100644
--- a/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentBaseService.java
+++ b/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentBaseService.java
@@ -166,6 +166,15 @@ public interface IDepartmentBaseService {
      */
     List<ZTreeDTO> listZTree(String departmentParentId, Map<String, Object> params);
 
+    /**
+     * zTree组织部门
+     *
+     * @param departmentParentId
+     * @param departmentType
+     * @return
+     */
+    List<ZTreeDTO> listZTree(String departmentParentId, Integer departmentType);
+
     /**
      * zTree组织部门
      *
diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java
index f68de9dc..6ee9d4cf 100644
--- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java
+++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java
@@ -151,6 +151,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return listZTree(params);
     }
 
+    @Override
+    public List<ZTreeDTO> listZTree(String departmentParentId, Integer departmentType) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("id", departmentParentId);
+        params.put("departmentType", departmentType);
+        return listZTree(params);
+    }
+
     @Override
     public List<ZTreeDTO> listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) {
         Map<String, Object> params = getHashMap(4);
diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java
index 3851a5eb..0d094522 100644
--- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java
+++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java
@@ -327,6 +327,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return listZTree(params);
     }
 
+    @Override
+    public List<ZTreeDTO> listZTree(String departmentParentId, Integer departmentType) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("departmentParentId", departmentParentId);
+        params.put("departmentType", departmentType);
+        return listZTree(params);
+    }
+
     @Override
     public List<ZTreeDTO> listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) {
         Map<String, Object> params = getHashMap(4);
diff --git a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml
index 60c4be47..38f046db 100644
--- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml
+++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml
@@ -293,6 +293,10 @@
         AND
             department_area_code = #{departmentAreaCode}
         </if>
+        <if test="departmentType != null and departmentType != ''">
+        AND
+            department_type = #{departmentType}
+        </if>
         ORDER BY
             department_order
     </select>