From 1f7b780a6fa4105ad611a926800c37a9405ac207 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Thu, 11 Nov 2021 16:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=93=E5=BA=93=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfaces/department/IDepartmentBaseService.java    | 9 +++++++++
 .../remote/department/IDepartmentUserRemoteService.java  | 2 +-
 .../service/department/impl/DepartmentServiceImpl.java   | 8 ++++++++
 pom.xml                                                  | 8 ++++++++
 .../department/service/impl/DepartmentServiceImpl.java   | 8 ++++++++
 .../main/resources/mybatis/mapper/department-mapper.xml  | 4 ++++
 6 files changed, 38 insertions(+), 1 deletion(-)

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 cf657823..5face5c8 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 areaCode
+     * @param parentId
+     * @return
+     */
+    List<ZTreeDTO> listZTreeByAreaCodeAndParentId(String areaCode, String parentId);
+
     /**
      * 部门ID列表
      *
diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java
index b357f4bf..d428d4c9 100644
--- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java
+++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java
@@ -25,7 +25,7 @@ public interface IDepartmentUserRemoteService {
     @RemoteGetMethod("/list")
     List<DepartmentUserDTO> list(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map<String, Object> params);
 
-    @RemoteGetMethod("/list/{department}")
+    @RemoteGetMethod("/list/{departmentId}")
     List<DepartmentUserDTO> listByDepartmentId(@RemoteServerParams String userCenter, @RemotePathParams("departmentId") String departmentId, @RemoteQueryParams("access_token") String accessToken);
 
     @RemotePostMethod("/list/department-ids")
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 6938c0eb..f68de9dc 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> listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("departmentAreaCode", departmentAreaCode);
+        params.put("id", departmentParentId);
+        return listZTree(params);
+    }
+
     @Override
     public List<String> listId(Map<String, Object> params) {
         return departmentRemoteService.listId(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params);
diff --git a/pom.xml b/pom.xml
index 0cb6c177..bb3376f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -528,8 +528,16 @@
             <id>maven-snapshots</id>
             <url>http://121.36.71.250:8888/repository/maven-snapshots/</url>
         </snapshotRepository>
+        <!--
+        <repository>
+            <id>sucstep-wg-basic-wg-basic</id>
+            <name>wg-basic</name>
+            <url>https://sucstep-maven.pkg.coding.net/repository/wg-basic/wg-basic/</url>
+        </repository>
+        -->
     </distributionManagement>
 
+
     <build>
         <finalName>${project.artifactId}</finalName>
         <!-- resource start -->
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 cfcf1428..3851a5eb 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> listZTreeByAreaCodeAndParentId(String departmentAreaCode, String departmentParentId) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("departmentAreaCode", departmentAreaCode);
+        params.put("departmentParentId", departmentParentId);
+        return listZTree(params);
+    }
+
     @Override
     public List<String> listId(Map<String, Object> params) {
         List<String> departmentIds = new ArrayList<>();
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 96ab006e..60c4be47 100644
--- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml
+++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml
@@ -289,6 +289,10 @@
                 #{departmentIds[${index}]}
             </foreach>
         </if>
+        <if test="departmentAreaCode != null and departmentAreaCode != ''">
+        AND
+            department_area_code = #{departmentAreaCode}
+        </if>
         ORDER BY
             department_order
     </select>