From 0e36947123ec790ce4ff5e9c22ed34d62a0e8a33 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 7 Jul 2022 14:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E8=8A=82=E7=82=B9=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/AgencyController.java    |  6 +++---
 .../java/com/epmet/dao/CustomerAgencyDao.java |  2 ++
 .../java/com/epmet/service/AgencyService.java |  4 ++--
 .../epmet/service/impl/AgencyServiceImpl.java |  6 +++++-
 .../resources/mapper/CustomerAgencyDao.xml    | 21 +++++++++++++++++--
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index aaf004290a..ce081bb714 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -510,13 +510,13 @@ public class AgencyController {
      * 获取区域编码下级的所有客户信息
      *
      * @param areaCode
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.AgencyResultDTO>>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.AgencyResultDTO>>
      * @author zhy
      * @date 2022/7/7 10:12
      */
     @GetMapping("/areasubagency/{areaCode}")
-    public Result<List<AgencyResultDTO>> getAreaSubAgency(@PathVariable String areaCode) {
-        List<AgencyResultDTO> dto = agencyService.getAreaSubAgency(areaCode);
+    public Result<List<AgencyResultDTO>> getAreaSubAgency(@LoginUser TokenDto tokenDto, @PathVariable String areaCode) {
+        List<AgencyResultDTO> dto = agencyService.getAreaSubAgency(tokenDto, areaCode);
         return new Result<List<AgencyResultDTO>>().ok(dto);
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 89e7070789..9c0d58e102 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -364,5 +364,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      */
     List<AgencyResultDTO> getAreaSubAgency(@Param("areaCode") String areaCode);
 
+    CustomerAgencyEntity getAreaRootAgency(@Param("customerId") String customerId);
+
 }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
index 697f581a69..7843ed299a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
@@ -183,10 +183,10 @@ public interface AgencyService {
      * 获取区域编码下级的所有客户信息
      *
      * @param areaCode
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.AgencyResultDTO>>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.AgencyResultDTO>>
      * @author zhy
      * @date 2022/7/7 10:12
      */
-    List<AgencyResultDTO> getAreaSubAgency(String areaCode);
+    List<AgencyResultDTO> getAreaSubAgency(TokenDto tokenDto, String areaCode);
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index aa9273ac6a..cb8652d4dc 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -903,7 +903,11 @@ public class AgencyServiceImpl implements AgencyService {
     }
 
     @Override
-    public List<AgencyResultDTO> getAreaSubAgency(String areaCode) {
+    public List<AgencyResultDTO> getAreaSubAgency(TokenDto tokenDto, String areaCode) {
+        if (NumConstant.ZERO_STR.equals(areaCode)) {
+            CustomerAgencyEntity root = customerAgencyDao.getAreaRootAgency(tokenDto.getCustomerId());
+            areaCode = root.getAreaCode();
+        }
         return customerAgencyDao.getAreaSubAgency(areaCode);
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 802006e573..fe41894c11 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -945,8 +945,25 @@
             AND ac.PID = '0'
             AND cop.PARAMETER_VALUE = 'open'
         <if test="areaCode != null and areaCode != ''">
-            AND AREA_CODE != #{areaCode}
-            AND AREA_CODE LIKE CONCAT(#{areaCode}, '%')
+            AND ac.AREA_CODE != #{areaCode}
+            AND ac.AREA_CODE LIKE CONCAT(#{areaCode}, '%')
+        </if>
+    </select>
+
+    <select id="getAreaRootAgency" resultType="com.epmet.entity.CustomerAgencyEntity">
+        SELECT
+        ac.*
+        FROM
+        customer_agency ac
+        INNER JOIN customer_org_parameter cop ON cop.CUSTOMER_ID = ac.CUSTOMER_ID
+        WHERE
+        ac.DEL_FLAG = '0'
+        AND cop.DEL_FLAG = '0'
+        AND cop.PARAMETER_KEY = 'area_code_switch'
+        AND ac.PID = '0'
+        AND cop.PARAMETER_VALUE = 'open'
+        <if test="customerId != null and customerId != ''">
+            AND ac.CUSTOMER_ID = #{customerId}
         </if>
     </select>