/gov/voice/article/agencygridlist 党建声音可选发布范围

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -728,6 +728,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         if (party) {
             //4.1:查询当前机关的网格列表以及所有下级机关的网格列表
             //当前机关下网格列表
+            // 未隐藏的网格
             List<AgencyGridListResultDTO> gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId());
             returnDTO.setGridList(gridList);
             //递归查询当前组织的下级组织以及每个下级组织对应的网格列表
@@ -762,6 +763,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         List<ArticleGridResultDTO> subAgencyList = baseDao.selectAllSubAgency(subAgencyPids);
         if (subAgencyList.size() > NumConstant.ZERO) {
             for (ArticleGridResultDTO sub : subAgencyList) {
+                //未隐藏的网格
                 List<AgencyGridListResultDTO> gridList = customerGridDao.selectAgencyGridList(sub.getAgencyId());
                 sub.setGridList(gridList);
                 List<ArticleGridResultDTO> subAgency = getGridList(sub.getPids() + ":" + sub.getAgencyId());

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -408,6 +408,7 @@
             grid_name AS "gridName"
         FROM customer_grid
         WHERE del_flag = '0'
+         and ABANDON_FLAG='0'
          AND pid = #{agencyId}
     </select>
 
@@ -429,6 +430,7 @@
         WHERE
             cg.del_flag = '0'
         AND ca.del_flag = '0'
+        and cg.ABANDON_FLAG='0'
         AND cg.pid = #{agencyId}
     </select>