From d216530497a4cfe3dbd849b855fde1fe84cfe816 Mon Sep 17 00:00:00 2001
From: syc <asda>
Date: Wed, 17 Aug 2022 14:44:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E7=BD=91=E6=A0=BC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dao/govorg/CustomerGridDao.java    |  1 +
 .../service/govorg/impl/GovOrgServiceImpl.java   |  2 +-
 .../resources/mapper/govorg/CustomerGridDao.xml  | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
index 10721a9f7a..9b8ba8580b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
@@ -86,4 +86,5 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
     CustomerGridDTO getGridInfo(@Param("gridId") String gridId);
 
     List<ScreenCustomerGridDTO> getSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
+    List<ScreenCustomerGridDTO> getAllSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index a07ebf0a7c..d2ee934888 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -1487,7 +1487,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         List<ScreenCustomerGridDTO> gridList = new ArrayList<>();
         //组织级别为街道的查询下级所有网格
         if (isGetSubAllGrid && (OrgLevelEnum.STREET.getCode().equals(dto.getLevel()))) {
-            gridList = customerGridDao.getSubGridList(customerId, agencyId);
+            gridList = customerGridDao.getAllSubGridList(customerId, agencyId);
             List<ScreenAgencyOrGridListDTO.AgencyGrid> allGridList = new ArrayList<>();
             gridList.forEach(gr -> {
                 ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
index cb90d827d3..13f296b87b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
@@ -197,4 +197,20 @@
         ORDER BY pid, grid_name
     </select>
 
+    <select id="getAllSubGridList" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO">
+        SELECT
+            customer_id AS customerId,
+            id AS gridId,
+            grid_name AS gridName,
+            pid AS parentAgencyId,
+            pids AS allParentIds
+        FROM
+            customer_grid
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND pids LIKE concat('%',#{agencyId},'%')
+        ORDER BY pid, grid_name
+    </select>
+
 </mapper>