From 4dff78a636a7da26e60d29ccb549304ba599ef71 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 21 Mar 2022 15:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AE=EF=BC=8C=E9=99=90=E5=80=BC=E6=9C=AA?=
 =?UTF-8?q?=E5=BA=9F=E5=BC=83=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/CustomerGridDao.java            | 2 +-
 .../java/com/epmet/service/impl/CustomerAgencyServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/CustomerGridDao.xml               | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index d642c4a911..3de988ec2c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -172,7 +172,7 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
     BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO);
 
     /**
-     * @Description 根据组织机关Id查询机关下网格列表
+     * @Description 根据组织机关Id查询机关下网格列表:未废弃的
      * @author sun
      */
     List<GridListResultDTO> selectGridList(@Param("agencyId") String agencyId);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 07bfa4eaf0..aa2d4fed1b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -439,7 +439,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
             });
         }
         //3:根据组织Id查询该组织下网格、人员列表
-        //3.1:查询组织下网格列表
+        //3.1:查询组织下网格列表:未废弃的
         List<GridListResultDTO> gridList = customerGridDao.selectGridList(canTick.getAgencyId());
         List<CustomerStaffGridDTO> gridStaffs = new ArrayList<>();
         if (null != gridList && gridList.size() > NumConstant.ZERO) {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index c3390d9cc9..ad26cd96ce 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -369,6 +369,7 @@
             <!-- AND cg.del_flag = 0 --><!-- 网格被删除时，首次在该网格注册的居民就找不到了所属网格，暂时关闭这个查询条件，避免缓存中user的showname和组成员member的usershowname出现空值 -->
     </select>
 
+    <!--    根据组织机关Id查询机关下网格列表:未废弃的 -->
     <select id="selectGridList" resultType="com.epmet.dto.result.GridListResultDTO">
         SELECT
             id AS "gridId",