diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/NeighborHoodOptionFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/NeighborHoodOptionFormDTO.java
new file mode 100644
index 0000000000..dbb6177931
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/NeighborHoodOptionFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/10/25 15:44
+ */
+@Data
+public class NeighborHoodOptionFormDTO extends PageFormDTO {
+    private String agencyId;
+    private String gridId;
+    private String neighborHoodName;
+
+    /**
+     * 当前登录用户：：
+     */
+    private String staffId;
+    private String customerId;
+}
+
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
index 894e31c4bc..a8cf04b4cb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
@@ -39,6 +39,7 @@ import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.form.NeighborHoodOptionFormDTO;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -155,13 +156,15 @@ public class IcNeighborHoodController {
      * 入参：gridId、agencyId
      * 返回当前组织及下级下的所有小区
      * @param tokenDto
-     * @param dto
+     * @param formDTO
      * @return
      */
     @PostMapping("neighborhood-options")
-    public Result<List<OptionResultDTO>> queryNeighborHoodOptions(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) {
-        // List<OptionResultDTO> list=icNeighborHoodService.queryNeighborHoodOptions(dto.getAgencyId(), dto.getGridId(),tokenDto.getUserId(),tokenDto.getCustomerId());
-        return new Result<List<OptionResultDTO>>().ok(null);
+    public Result<List<OptionResultDTO>> queryNeighborHoodOptions(@LoginUser TokenDto tokenDto, @RequestBody NeighborHoodOptionFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        List<OptionResultDTO> list=icNeighborHoodService.queryNeighborHoodOptions(formDTO);
+        return new Result<List<OptionResultDTO>>().ok(list);
     }
 
     /**
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 afe0374247..2fd4f25eee 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
@@ -18,12 +18,14 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.NeighborHoodAndManagementDTO;
 import com.epmet.dto.form.CheckHouseInfoFormDTO;
 import com.epmet.dto.form.HouseInformationFormDTO;
 import com.epmet.dto.form.IcNeighborHoodListFormDTO;
+import com.epmet.dto.form.NeighborHoodOptionFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.entity.IcNeighborHoodEntity;
@@ -220,4 +222,6 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
      * @return
      */
     IcNeighborHoodEntity getNeighborHoodInfoByName(CheckHouseInfoFormDTO formDTO);
+
+    List<OptionResultDTO> queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
index 266d0f9b41..2755cf3af0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
@@ -27,6 +27,7 @@ import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.NeighborHoodAndManagementDTO;
 import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
+import com.epmet.dto.form.NeighborHoodOptionFormDTO;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.IcNeighborHoodDetailDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
@@ -195,4 +196,11 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcNeighborHoodDTO>
     */
     Result<IcNeighborHoodDetailDTO> neighborhoodDetail(String neighborhoodId);
+
+    /**
+     * 返回当前组织及下级下的所有小区
+     * @param formDTO
+     * @return
+     */
+    List<OptionResultDTO> queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO);
 }
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 e14ea745ab..719bb0c27c 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
@@ -51,6 +51,7 @@ import com.epmet.dto.*;
 import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.form.NeighborHoodOptionFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.excel.IcNeighborHoodExcel;
@@ -824,4 +825,28 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         return new Result<IcNeighborHoodDetailDTO>().ok(result);
     }
 
+    /**
+     * 返回当前组织及下级下的所有小区
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public List<OptionResultDTO> queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getGridId()) && StringUtils.isBlank(formDTO.getAgencyId())) {
+            // 默认查询当前工作人员所属组织及下级的
+            CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+            formDTO.setAgencyId(staffInfoCacheResult.getAgencyId());
+        }
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
+        List<OptionResultDTO> list = baseDao.queryNeighborHoodOptions(formDTO);
+        return list;
+    }
+
+
+
+
+
+
+
 }
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 96ec0dd57f..1a0b871150 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
@@ -673,4 +673,19 @@
 
     </select>
 
+    <select id="queryNeighborHoodOptions" parameterType="com.epmet.dto.form.NeighborHoodOptionFormDTO" resultType="com.epmet.commons.tools.dto.result.OptionResultDTO">
+        SELECT
+            h.NEIGHBOR_HOOD_NAME as label,
+            h.ID as `value`
+        FROM
+            ic_neighbor_hood h
+        WHERE
+            h.DEL_FLAG = '0'
+          AND h.CUSTOMER_ID = #{customerId}
+          AND ( h.AGENCY_ID = #{agencyId} OR h.AGENCY_PIDS LIKE concat( '%', #{agencyId}, '%' ) )
+          and h.NEIGHBOR_HOOD_NAME like concat('%',#{neighborHoodName},'%')
+          and h.GRID_ID=#{gridId}
+        ORDER BY
+            h.NEIGHBOR_HOOD_NAME ASC
+    </select>
 </mapper>