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 b23681737d..d8e2f5ab93 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
@@ -37,7 +37,7 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
 
     /**
      * @Author sun
-     * @Description 查询组织下直属网格列表
+     * @Description 根据组织Id查询当前组织及下级所有网格列表
      **/
     List<GridInfoResultDTO> selectAgencyGridList(@Param("agencyId") String agencyId);
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
index 413fc6cd19..5c37532bdd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
@@ -236,7 +236,7 @@ public class GovIssueServiceImpl implements GovIssueService {
         List<ShiftProjectIssueListResultDTO> resultList = new ArrayList<>();
         int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
         fromDTO.setPageNo(pageIndex);
-        //1.查询组织下议题列表数据
+        //1.查询组织及下级已转项目议题列表数据
         List<IssueShiftProjectResultDTO> issueList = issueDao.selectIssueListByGridIds(fromDTO);
         if (null == issueList || issueList.size() < NumConstant.ONE) {
             return resultList;
@@ -274,7 +274,7 @@ public class GovIssueServiceImpl implements GovIssueService {
         int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
         fromDTO.setPageNo(pageIndex);
 
-        //1.查询组织下议题转项目切项目已关闭列表数据
+        //1.查询组织及下级议题已关闭列表数据
         resultList = issueDao.selectClosedListGov(fromDTO);
         if(null == resultList || resultList.size()<NumConstant.ONE){
             return new ArrayList<>();
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
index f1890edfab..c0b7fff4bd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -22,7 +22,7 @@ public interface GovOrgService {
     /**
      * @param agencyId
      * @Author sun
-     * @Description 根据组织Id查询网格列表
+     * @Description 根据组织Id查询当前组织及下级所有网格列表
      **/
     List<GridInfoResultDTO> gridList(String agencyId);
 
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 b734c4542d..c22eaf986c 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
@@ -91,7 +91,7 @@ public class GovOrgServiceImpl implements GovOrgService {
     /**
      * @param agencyId
      * @Author sun
-     * @Description 根据组织Id查询网格列表
+     * @Description 根据组织Id查询当前组织及下级所有网格列表
      **/
     @Override
     public List<GridInfoResultDTO> gridList(String agencyId) {
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
index 04be9d6d8d..8d921cb909 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
@@ -72,7 +72,7 @@
         WHERE
             i.del_flag = '0'
         AND i.issue_status = 'shift_project'
-        AND i.org_id = #{agencyId}
+        AND i.org_id_path like concat('%', #{agencyId}, '%')
         ORDER BY
             count DESC
         LIMIT #{pageNo}, #{pageSize}
@@ -90,7 +90,7 @@
             issue i
         WHERE
             i.del_flag = '0'
-        AND i.org_id = #{agencyId}
+        AND i.org_id_path like concat('%', #{agencyId}, '%')
         AND i.issue_status = 'closed'
         ORDER BY
             count DESC
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 b49823cac6..0b4fe7e0ee 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
@@ -11,7 +11,7 @@
             customer_grid
         WHERE
             del_flag = '0'
-        AND pid = #{agencyId}
+        AND pids like concat('%', #{agencyId}, '%')
     </select>
 
     <select id="selectGridByIds" resultType="com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO">