From 783514a285c0b3f442140222ea2bde5840c4cdcb Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Mon, 8 Nov 2021 15:58:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E7=BB=87=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E8=B5=84=E6=BA=90=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../department/IDepartmentBaseService.java    | 31 +++++++++++++++++--
 .../impl/DepartmentServiceImpl.java           | 28 +++++++++++++++++
 .../DepartmentResourceController.java         |  5 ---
 .../service/impl/DepartmentServiceImpl.java   | 28 +++++++++++++++++
 .../mybatis/mapper/department-mapper.xml      |  5 ++-
 5 files changed, 89 insertions(+), 8 deletions(-)

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 2344ac77..cf657823 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
@@ -49,19 +49,46 @@ public interface IDepartmentBaseService {
     /**
      * 部门列表
      *
-     * @param departmentAreaCode
+     * @param departmentAreaCode 地区编码
+     * @param order              排序方式
+     * @return
+     */
+    List<DepartmentDTO> listByAreaCodeAndOrder(String departmentAreaCode, String order);
+
+    /**
+     * 部门列表
+     *
+     * @param departmentAreaCode 地区编码
      * @return
      */
     List<DepartmentDTO> listAllByAreaCode(String departmentAreaCode);
 
+    /**
+     * 部门列表
+     *
+     * @param departmentAreaCode 地区编码
+     * @param order              排序方式
+     * @return
+     */
+    List<DepartmentDTO> listAllByAreaCodeAndOrder(String departmentAreaCode, String order);
+
     /**
      * 部门全部子列表
      *
-     * @param departmentAreaCode
+     * @param departmentAreaCode 地区编码
      * @return
      */
     List<DepartmentDTO> listSubAllByAreaCode(String departmentAreaCode);
 
+    /**
+     * 部门全部子列表
+     *
+     * @param departmentAreaCode 地区编码
+     * @param order              排序方式
+     * @return
+     */
+    List<DepartmentDTO> listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order);
+
     /**
      * 通过ID获取组织部门详情
      *
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 e1c5a7e4..6938c0eb 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
@@ -57,6 +57,15 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return list(params);
     }
 
+    @Override
+    public List<DepartmentDTO> listByAreaCodeAndOrder(String departmentAreaCode, String order) {
+        Map<String, Object> params = getHashMap(6);
+        params.put("departmentAreaCode", departmentAreaCode);
+        params.put("sort", "departmentAreaCode");
+        params.put("order", order);
+        return list(params);
+    }
+
     @Override
     public List<DepartmentDTO> listAllByAreaCode(String departmentAreaCode) {
         Map<String, Object> params = getHashMap(2);
@@ -64,6 +73,15 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return list(params);
     }
 
+    @Override
+    public List<DepartmentDTO> listAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
+        Map<String, Object> params = getHashMap(6);
+        params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0'));
+        params.put("sort", "departmentAreaCode");
+        params.put("order", order);
+        return list(params);
+    }
+
     @Override
     public List<DepartmentDTO> listSubAllByAreaCode(String departmentAreaCode) {
         Map<String, Object> params = getHashMap(4);
@@ -72,6 +90,16 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return list(params);
     }
 
+    @Override
+    public List<DepartmentDTO> listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
+        Map<String, Object> params = getHashMap(8);
+        params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0'));
+        params.put("excludeDepartmentAreaCode", departmentAreaCode);
+        params.put("sort", "departmentAreaCode");
+        params.put("order", order);
+        return list(params);
+    }
+
     @Override
     public DepartmentDTO get(String departmentId) {
         return departmentRemoteService.get(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken());
diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentResourceController.java b/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentResourceController.java
index e6c1a587..b437ba5c 100644
--- a/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentResourceController.java
+++ b/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentResourceController.java
@@ -106,11 +106,6 @@ public class DepartmentResourceController extends DefaultBaseController {
     @GetMapping("listpage")
     public SuccessResultList<List<DepartmentDTO>> listPage(ListPage page) {
         Map<String, Object> params = requestParams();
-        String departmentParentId = "0";
-        if (!StringUtils.isBlank(params.get("parentId") == null ? null : params.get("parentId").toString())) {
-            departmentParentId = params.get("parentId").toString();
-        }
-        params.put("departmentParentId", departmentParentId);
         page.setParams(params);
         return departmentService.listPage(page);
     }
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 41ec2ae2..cfcf1428 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
@@ -203,6 +203,15 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return list(params);
     }
 
+    @Override
+    public List<DepartmentDTO> listByAreaCodeAndOrder(String departmentAreaCode, String order) {
+        Map<String, Object> params = getHashMap(6);
+        params.put("departmentAreaCode", departmentAreaCode);
+        params.put("sort", "departmentAreaCode");
+        params.put("order", order);
+        return list(params);
+    }
+
     @Override
     public List<DepartmentDTO> listAllByAreaCode(String departmentAreaCode) {
         Map<String, Object> params = getHashMap(2);
@@ -210,6 +219,15 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return list(params);
     }
 
+    @Override
+    public List<DepartmentDTO> listAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
+        Map<String, Object> params = getHashMap(6);
+        params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0'));
+        params.put("sort", "departmentAreaCode");
+        params.put("order", order);
+        return list(params);
+    }
+
     @Override
     public List<DepartmentDTO> listSubAllByAreaCode(String departmentAreaCode) {
         Map<String, Object> params = getHashMap(4);
@@ -218,6 +236,16 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
         return list(params);
     }
 
+    @Override
+    public List<DepartmentDTO> listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
+        Map<String, Object> params = getHashMap(8);
+        params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0'));
+        params.put("excludeDepartmentAreaCode", departmentAreaCode);
+        params.put("sort", "departmentAreaCode");
+        params.put("order", order);
+        return list(params);
+    }
+
     @Override
     public SuccessResultList<List<DepartmentDTO>> listPage(ListPage page) {
         PageHelper.startPage(page.getPage(), page.getRows());
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 84514860..96ab006e 100644
--- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml
+++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml
@@ -421,7 +421,7 @@
             department_area_code != #{excludeDepartmentAreaCode}
         </if>
         <choose>
-            <when test="sort != null and (sort == 'departmentName' or sort == 'departmentNameEn' or sort == 'departmentNameOther' or sort == 'departmentCode' or sort == 'departmentType' or sort == 'departmentState')">
+            <when test="sort != null and (sort == 'departmentName' or sort == 'departmentNameEn' or sort == 'departmentNameOther' or sort == 'departmentCode' or sort == 'departmentType' or sort == 'departmentState' or sort == 'departmentAreaCode')">
                 ORDER BY
                 <if test="sort == 'departmentName'">
                     department_name ${order}
@@ -441,6 +441,9 @@
                 <if test="sort == 'departmentState'">
                     department_state ${order}
                 </if>
+                <if test="sort == 'departmentAreaCode'">
+                    department_area_code ${order}
+                </if>
             </when>
             <otherwise>
             ORDER BY