From 69329e9b7a3a0a183de9490b6fa567ee5726f593 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Tue, 18 Jan 2022 11:03:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=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  | 10 ++++++++++
 .../service/department/impl/DepartmentServiceImpl.java |  8 ++++++++
 .../department/service/impl/DepartmentServiceImpl.java |  8 ++++++++
 3 files changed, 26 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 b98504ec..01c46fd1 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
@@ -149,6 +149,16 @@ public interface IDepartmentBaseService {
      */
     SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCode(String departmentAreaCode, ListPage page);
 
+    /**
+     * 组织部门子列表
+     *
+     * @param departmentAreaCode 部门地区编码
+     * @param type               部门类别
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page);
+
     /**
      * 组织部门列表，递归获取全部内容
      *
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 be5ea1a9..e0e9ef99 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
@@ -142,6 +142,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return listPage(page);
     }
 
+    @Override
+    public SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page) {
+        page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0'));
+        page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode);
+        page.getParams().put("departmentType", departmentType);
+        return listPage(page);
+    }
+
     @Override
     public List<DepartmentDTO> listAll(Map<String, Object> params) {
         return departmentRemoteService.listAll(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
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 fc5deee4..385d9d55 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
@@ -296,6 +296,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return listPage(page);
     }
 
+    @Override
+    public SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page) {
+        page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0'));
+        page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode);
+        page.getParams().put("departmentType", departmentType);
+        return listPage(page);
+    }
+
     @Override
     public DepartmentDTO get(String departmentId) {
         Map<String, Object> params = getHashMap(1);