From d956f30461f7dec1c92240039d72a06ad197f24d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 13 May 2021 15:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=9F=E4=BA=A7=E4=B8=8A?=
 =?UTF-8?q?=E5=B9=B3=E9=9F=B3=E6=8F=90=E5=87=BA=E7=9A=84=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E8=B6=85=E8=BF=87=E5=8D=81=E4=B8=AA=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=EF=BC=8C=E6=80=BB=E6=95=B0=E5=8D=B4=E6=9C=80=E5=A4=A7?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=8D=81=E4=B8=AA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=90=E4=BB=A3=E7=A0=81=E8=A2=AB=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BF=87=E9=80=A0=E6=88=90=E7=9A=84=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/CustomerAgencyDao.java |  1 +
 .../java/com/epmet/service/impl/AgencyServiceImpl.java |  2 +-
 .../src/main/resources/mapper/CustomerAgencyDao.xml    | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

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 bdc8814ff4..f798c8b354 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
@@ -58,6 +58,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @Description 组织首页-下级机关列表
      **/
     List<SubListResultDTO> selectSubAgencyById(@Param("pId") String pId, @Param("agencyNum") Integer agencyNum);
+    List<SubListResultDTO> selectSubAgencyByAgencyId(@Param("pId") String pId);
 
     /**
      * @param pId
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 e83b78ba77..287dfef613 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
@@ -287,7 +287,7 @@ public class AgencyServiceImpl implements AgencyService {
     public Result<SubAgencyResultDTO> subAgencyList(SubAgencyFormDTO formDTO) {
         SubAgencyResultDTO subAgencyResultDTO = new SubAgencyResultDTO();
         //1:根据当前机关Id查询直属下一级机关列表，只返回前十条
-        List<SubListResultDTO> agencyList = customerAgencyDao.selectSubAgencyById(formDTO.getAgencyId(),formDTO.getAgencyNum());
+        List<SubListResultDTO> agencyList = customerAgencyDao.selectSubAgencyByAgencyId(formDTO.getAgencyId());
         if (null == agencyList || agencyList.size() < NumConstant.ONE) {
             subAgencyResultDTO.setAgencyList(new ArrayList<SubListResultDTO>());
             subAgencyResultDTO.setSubAgencyCount(NumConstant.ZERO);
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 ea6f94a1e8..f7dee28823 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
@@ -70,6 +70,16 @@
         ORDER BY created_time DESC
         LIMIT #{agencyNum}
     </select>
+    <select id="selectSubAgencyByAgencyId" resultType="com.epmet.dto.result.SubListResultDTO">
+        SELECT
+            id AS 'agencyId',
+            organization_name AS 'agencyName',
+            `level` AS 'agencyLevel'
+        FROM customer_agency
+        WHERE del_flag = '0'
+        AND pid = #{pId}
+        ORDER BY created_time DESC
+    </select>
 
     <select id="selectAgencyList" resultType="com.epmet.dto.result.AgencyListResultDTO">
         SELECT