diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
index a25bb785ef..b3dd464835 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
@@ -227,11 +227,11 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
     /**
      * 楼栋列表
      *
-     * @param formDTO
+     * @param neighborhoodId
      * @return java.util.List<com.epmet.commons.tools.dto.result.OptionResultDTO>
      * @author zhy
      * @date 2022/8/19 14:01
      */
-    List<OptionResultDTO> selectBuildingList(IcNeighborHoodDTO formDTO);
+    List<OptionResultDTO> selectBuildingList(@Param("value") String neighborhoodId);
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 2ddc07a897..85bd613f1d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -212,6 +212,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     }
 
     public List<OptionResultDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) {
+        dto.setCustomerId(tokenDto.getCustomerId());
         if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) {
             log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区");
             CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index 603947caf1..ada7bb8199 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -25,6 +25,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 小区楼栋关系 -->
     <resultMap id="neighborhoodBuildingMap" type="com.epmet.commons.tools.dto.result.OptionResultDTO">
         <id column="value" property="value" />
         <result column="label" property="label"/>
@@ -681,6 +682,9 @@
         WHERE
             DEL_FLAG = '0'
           AND CUSTOMER_ID = #{customerId}
+        <if test="gridId != null and gridId != ''">
+            AND GRID_ID = #{gridId}
+        </if>
           AND (
                     AGENCY_ID = #{agencyId}
                 OR AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))