From f99c16f3e935003349baaef0f165725d4ca6e367 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 30 Dec 2020 10:40:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E9=85=8D=E7=BD=AE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dataaggre/aspect/RequestLogAspect.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/aspect/RequestLogAspect.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/aspect/RequestLogAspect.java
index 97b2b97798..34cf9f3d69 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/aspect/RequestLogAspect.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/aspect/RequestLogAspect.java
@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 public class RequestLogAspect extends BaseRequestLogAspect {
 
     @Override
-    @Around(value = "execution(* com.epmet.dataaggre.controller.*.*Controller*.*(..)) ")
+    @Around(value = "execution(* com.epmet.dataaggre.controller.*Controller.*(..)) ")
     public Object proceed(ProceedingJoinPoint point) throws Throwable {
         return super.proceed(point, getRequest());
     }

From 019e387d1656c8ac56e91feb92b5767b323af1ac Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 30 Dec 2020 10:51:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=A0=91=E7=BB=93=E6=9E=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dataaggre/dao/govorg/CustomerGridDao.java   |  6 ++++++
 .../service/govorg/impl/GovOrgServiceImpl.java        |  2 +-
 .../main/resources/mapper/govorg/CustomerGridDao.xml  | 11 +++++++++++
 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 d8e2f5ab93..1da9910104 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
@@ -48,4 +48,10 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Author sun
      */
     List<GridsInfoListResultDTO> selectGridByIds(@Param("gridIdList") List<String> gridIdList);
+
+    /**
+     * @Author sun
+     * @Description 根据组织Id查询当前组织下所有网格列表
+     **/
+    List<GridInfoResultDTO> selectGridListByAgencyId(@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 c22eaf986c..91d59d0983 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
@@ -60,7 +60,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         returnDTO.setAgencyName(agencyEntity.getOrganizationName());
 
         //3:查询当前机关下的网格列表
-        List<GridInfoResultDTO> gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId());
+        List<GridInfoResultDTO> gridList = customerGridDao.selectGridListByAgencyId(agencyEntity.getId());
         returnDTO.setGridList(gridList);
 
         //4:递归查询当前组织的下级组织以及每个下级组织对应的网格列表
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 0b4fe7e0ee..331246a2f5 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
@@ -41,4 +41,15 @@
         )<!-- 按照foreach中遍历的Id顺序排序(按网格访问时间倒序) -->
     </select>
 
+    <select id="selectGridListByAgencyId" resultType="com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO">
+        SELECT
+            id AS "gridId",
+            grid_name AS "gridName"
+        FROM
+            customer_grid
+        WHERE
+            del_flag = '0'
+        AND pid = #{agencyId}
+    </select>
+
 </mapper>