diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java
index 920d48f56b..6726f0547a 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java
@@ -37,7 +37,7 @@ public class AreaCodeDTO implements Serializable {
     /**
      * 主键
      */
-	private Integer id;
+	private String id;
 
     /**
      * 省份code
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDetailFormDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDetailFormDTO.java
new file mode 100644
index 0000000000..f4ca97d775
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDetailFormDTO.java
@@ -0,0 +1,13 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+@Data
+public class AreaCodeDetailFormDTO {
+
+    private String areaCode;
+    /**
+     *  省级:province; 市级: city; 区县级: district ;乡（镇、街道）级:street ;社区级：community
+     */
+    private String level;
+}
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/CustomerTreeDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/CustomerTreeDTO.java
new file mode 100644
index 0000000000..80bf551608
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/CustomerTreeDTO.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 客户关系表(01.14 add)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-02-03
+ */
+@Data
+public class CustomerTreeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+
+    /**
+     * 当前客户级别（社区级：community，
+乡（镇、街道）级:street,
+区县级: district,
+市级: city
+省级:province）
+     */
+	private String level;
+
+    /**
+     * 当前客户的地区编码，实际就是根组织的area_code
+     */
+	private String areaCode;
+
+    /**
+     * 当前客户的地区名称
+     */
+    private String areaName;
+
+    /**
+     * 当前客户的父节点地区名称
+     */
+    private String parentCode;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 下一级
+     */
+    private List<CustomerTreeDTO> children;
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
index 4214e77cf8..43766990ba 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
@@ -98,6 +98,28 @@ public interface EpmetCommonServiceOpenFeignClient {
     @PostMapping("commonservice/workday/workminutes")
     Result<Map<String,Integer>> workMinutes(@RequestBody WorkMinuteFormDTO param);
 
+    /**
+     * 行政地区编码查询
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.AreaCodeDictResultDTO>>
+     * @author zhy
+     * @date 2022/7/6 15:07
+     */
+    @PostMapping("commonservice/areacode/areacodedetail")
+    Result<AreaCodeResultDTO> areaCodeDetail(@RequestBody AreaCodeDetailFormDTO formDTO);
+
+    /**
+     * 行政地区编码树查询
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.AreaCodeDictResultDTO>>
+     * @author zhy
+     * @date 2022/7/6 15:07
+     */
+    @PostMapping("commonservice/areacode/areacodetree")
+    Result<List<CustomerTreeDTO>> areaCodeTree(@RequestBody CustomerTreeDTO formDTO);
+
     /**
      * @Description  行政地区编码查询
      * @Param formDTO
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
index 21f7fe531a..05b73bba65 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
@@ -79,6 +79,16 @@ public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonSer
         return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "workMinutes", param);
     }
 
+    @Override
+    public Result<AreaCodeResultDTO> areaCodeDetail(AreaCodeDetailFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "areaCodeDetail", formDTO);
+    }
+
+    @Override
+    public Result<List<CustomerTreeDTO>> areaCodeTree(CustomerTreeDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "areaCodeTree", formDTO);
+    }
+
     @Override
     public Result<List<AreaCodeDictResultDTO>> areaCodeDictTree(AreaCodeDictFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "areaCodeDictTree", formDTO);
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java
index 7bf4e537f8..ca212e908f 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java
@@ -25,12 +25,10 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.AreaCodeDTO;
-import com.epmet.dto.form.AddAreaCodeDictFormDTO;
-import com.epmet.dto.form.AddAreaCodeFormDTO;
-import com.epmet.dto.form.AreaCodeDictFormDTO;
-import com.epmet.dto.form.AreaCodeFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
 import com.epmet.dto.result.AreaCodeResultDTO;
+import com.epmet.dto.result.CustomerTreeDTO;
 import com.epmet.service.AreaCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -133,4 +131,26 @@ public class AreaCodeController {
     public Result<List<AreaCodeResultDTO>> nextArea(@RequestBody AreaCodeFormDTO formDTO){
         return new Result<List<AreaCodeResultDTO>>().ok(areaCodeService.nextArea(formDTO));
     }
+
+    /**
+     * @Description  行政地区编码查询
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/1/7 下午1:41
+     */
+    @PostMapping("areacodedetail")
+    public Result<AreaCodeResultDTO> areaCodeDetail(@RequestBody AreaCodeDetailFormDTO formDTO){
+        return new Result<AreaCodeResultDTO>().ok(areaCodeService.getAreaCodeDetail(formDTO));
+    }
+
+    /**
+     * @Description  行政地区编码查询
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/1/7 下午1:41
+     */
+    @PostMapping("areacodetree")
+    public Result<List<CustomerTreeDTO>> areaCodeTree(@RequestBody CustomerTreeDTO formDTO){
+        return new Result<List<CustomerTreeDTO>>().ok(areaCodeService.getAreaCodeTree(formDTO));
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java
index bfe5c8139e..ab101aba89 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java
@@ -37,19 +37,25 @@ public interface AreaCodeDao extends BaseDao<AreaCodeEntity> {
 
     List<AreaCodeDTO> selectAllArea();
 
-    AreaCodeDTO selectByCountyCode(String countyCode);
+    AreaCodeDTO selectByCountyCode(@Param("countyCode") String countyCode);
 
-    AreaCodeDTO selectByCityCode(String cityCode);
+    AreaCodeDTO selectByCityCode(@Param("cityCode") String cityCode);
+
+    AreaCodeDTO selectByProvinceCode(@Param("provinceCode") String provinceCode);
+
+    AreaCodeResultDTO selectByStreetCode(@Param("streetCode") String streetCode);
+
+    AreaCodeResultDTO selectByCommunityCode(@Param("communityCode") String communityCode);
 
     AreaCodeDTO selectMaxCounty(String cityCode);
 
     List<AreaCodeResultDTO> selectProvince();
 
-    List<AreaCodeResultDTO> selectCity(@Param("pCode")String pCode);
+    List<AreaCodeResultDTO> selectCity(@Param("pCode") String pCode);
 
-    List<AreaCodeResultDTO> selectDistrict(@Param("pCode")String pCode);
+    List<AreaCodeResultDTO> selectDistrict(@Param("pCode") String pCode);
 
-    List<AreaCodeResultDTO> selectStreet(@Param("pCode")String pCode);
+    List<AreaCodeResultDTO> selectStreet(@Param("pCode") String pCode);
 
-    List<AreaCodeResultDTO> selectCommunity(@Param("pCode")String pCode);
+    List<AreaCodeResultDTO> selectCommunity(@Param("pCode") String pCode);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java
index e452332fea..6467bb82f0 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java
@@ -20,12 +20,10 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.AreaCodeDTO;
-import com.epmet.dto.form.AddAreaCodeDictFormDTO;
-import com.epmet.dto.form.AddAreaCodeFormDTO;
-import com.epmet.dto.form.AreaCodeDictFormDTO;
-import com.epmet.dto.form.AreaCodeFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
 import com.epmet.dto.result.AreaCodeResultDTO;
+import com.epmet.dto.result.CustomerTreeDTO;
 import com.epmet.entity.AreaCodeEntity;
 
 import java.util.List;
@@ -127,4 +125,8 @@ public interface AreaCodeService extends BaseService<AreaCodeEntity> {
     String addAreaCode(AddAreaCodeFormDTO formDTO);
 
     List<AreaCodeResultDTO> nextArea(AreaCodeFormDTO formDTO);
+
+    AreaCodeResultDTO getAreaCodeDetail(AreaCodeDetailFormDTO formDTO);
+
+    List<CustomerTreeDTO> getAreaCodeTree(CustomerTreeDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
index 4d873b333e..b0f519a3ac 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
@@ -36,12 +36,10 @@ import com.epmet.dao.AreaCodeChildDao;
 import com.epmet.dao.AreaCodeDao;
 import com.epmet.dto.AreaCodeChildDTO;
 import com.epmet.dto.AreaCodeDTO;
-import com.epmet.dto.form.AddAreaCodeDictFormDTO;
-import com.epmet.dto.form.AddAreaCodeFormDTO;
-import com.epmet.dto.form.AreaCodeDictFormDTO;
-import com.epmet.dto.form.AreaCodeFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
 import com.epmet.dto.result.AreaCodeResultDTO;
+import com.epmet.dto.result.CustomerTreeDTO;
 import com.epmet.entity.AreaCodeEntity;
 import com.epmet.redis.AreaCodeRedis;
 import com.epmet.service.AreaCodeChildService;
@@ -72,6 +70,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     private AreaCodeChildDao childDao;
     @Autowired
     private AreaCodeChildService areaCodeChildService;
+
     @Override
     public PageData<AreaCodeDTO> page(Map<String, Object> params) {
         IPage<AreaCodeEntity> page = baseDao.selectPage(
@@ -88,8 +87,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
         return ConvertUtils.sourceToTarget(entityList, AreaCodeDTO.class);
     }
 
-    private QueryWrapper<AreaCodeEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<AreaCodeEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<AreaCodeEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -125,7 +124,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     }
 
     /**
-     * @Description  行政地区编码查询
+     * @Description 行政地区编码查询
      * @Param formDTO
      * @author zxc
      * @date 2021/1/7 下午1:41
@@ -134,14 +133,14 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     public List<AreaCodeDictResultDTO> areaCodeDictTree(AreaCodeDictFormDTO formDTO) {
         List<AreaCodeDictResultDTO> tree = new ArrayList<>();
         String s = areaCodeRedis.get(AreaCodeConstant.SCREEN_TREE);
-        if (StringUtils.isNotBlank(s)){
-            tree = JSON.parseArray(s,AreaCodeDictResultDTO.class);
-        }else {
+        if (StringUtils.isNotBlank(s)) {
+            tree = JSON.parseArray(s, AreaCodeDictResultDTO.class);
+        } else {
             List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = disposeTree(formDTO);
-            areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS);
+            areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE, areaCodeDictResultDTOS);
             tree = areaCodeDictResultDTOS;
         }
-        if (StringUtils.isBlank(formDTO.getRootAreaCode())){
+        if (StringUtils.isBlank(formDTO.getRootAreaCode())) {
             return tree;
         }
         List<AreaCodeDictResultDTO> treeByRootAreaCode = getTreeByRootAreaCode(tree, formDTO.getRootAreaCode());
@@ -149,12 +148,12 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     }
 
     /**
-     * @Description  行政区树查询
+     * @Description 行政区树查询
      * @Param
      * @author zxc
      * @date 2021/1/8 上午8:57
      */
-    public List<AreaCodeDictResultDTO> disposeTree(AreaCodeDictFormDTO formDTO){
+    public List<AreaCodeDictResultDTO> disposeTree(AreaCodeDictFormDTO formDTO) {
         // 查询所有省市区
         List<AreaCodeDTO> areaCodeDTOS = baseDao.selectAllArea();
         // 查询所有街道、社区
@@ -173,8 +172,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             dto.setCode(four.getCode());
             dto.setName(four.getName());
             dto.setParentCode(four.getPCode());
-            groupByPCode.forEach((pCode,v) -> {
-                if (dto.getCode().equals(pCode)){
+            groupByPCode.forEach((pCode, v) -> {
+                if (dto.getCode().equals(pCode)) {
                     List<AreaCodeDictResultDTO> fiveResult = new ArrayList<>();
                     v.forEach(five -> {
                         AreaCodeDictResultDTO fiveDto = new AreaCodeDictResultDTO();
@@ -189,7 +188,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             fourResult.add(dto);
         });
         List<AreaCodeDictResultDTO> fourSort = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(fourResult)){
+        if (!CollectionUtils.isEmpty(fourResult)) {
             fourSort = fourResult.stream().sorted(Comparator.comparing(AreaCodeDictResultDTO::getCode)).collect(Collectors.toList());
         }
 
@@ -209,7 +208,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
                 dto.setName(three.getCountyName());
                 List<AreaCodeDictResultDTO> fourOnceResult = new ArrayList<>();
                 finalFourSort.forEach(four -> {
-                    if (dto.getCode().equals(four.getParentCode())){
+                    if (dto.getCode().equals(four.getParentCode())) {
                         fourOnceResult.add(four);
                     }
                 });
@@ -220,13 +219,13 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             cityDto.setChildren(threeSort);
             cityResult.add(cityDto);
         });
-        groupByProvince.forEach((p,v) -> {
+        groupByProvince.forEach((p, v) -> {
             AreaCodeDictResultDTO dto = new AreaCodeDictResultDTO();
             dto.setCode(p);
             dto.setName(v.get(NumConstant.ZERO).getProvinceName());
             List<AreaCodeDictResultDTO> cityOnceResult = new ArrayList<>();
             cityResult.forEach(c -> {
-                if (dto.getCode().equals(c.getParentCode())){
+                if (dto.getCode().equals(c.getParentCode())) {
                     cityOnceResult.add(c);
                 }
             });
@@ -239,54 +238,51 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     }
 
     /**
-     * @Description  根据节点获取组织区域树【遍历】，传参只能是 省，市，区级别 【暂时这样，循环太多了】
-     *
-     *
+     * @Description 根据节点获取组织区域树【遍历】，传参只能是 省，市，区级别 【暂时这样，循环太多了】
+     * <p>
+     * <p>
      * 暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样
-     *   ==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==
-     *     暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样
-     *
-     *
-     *
+     * ==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==
+     * 暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样
      * @Param tree
      * @Param rootAreaCode
      * @author zxc
      * @date 2021/1/8 上午10:02
      */
-    public List<AreaCodeDictResultDTO> getTreeByRootAreaCode(List<AreaCodeDictResultDTO> tree , String rootAreaCode){
+    public List<AreaCodeDictResultDTO> getTreeByRootAreaCode(List<AreaCodeDictResultDTO> tree, String rootAreaCode) {
         List<AreaCodeDictResultDTO> result = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(tree)){
+        if (!CollectionUtils.isEmpty(tree)) {
             // 省级获取
             for (AreaCodeDictResultDTO dto : tree) {
-                if (rootAreaCode.equals(dto.getCode())){
+                if (rootAreaCode.equals(dto.getCode())) {
                     result.add(dto);
                     return result;
                 }
                 // 市级获取
-                if (!CollectionUtils.isEmpty(dto.getChildren())){
+                if (!CollectionUtils.isEmpty(dto.getChildren())) {
                     for (AreaCodeDictResultDTO child : dto.getChildren()) {
-                        if (rootAreaCode.equals(child.getCode())){
+                        if (rootAreaCode.equals(child.getCode())) {
                             result.add(child);
                             return result;
                         }
                         // 区级获取
-                        if (!CollectionUtils.isEmpty(child.getChildren())){
+                        if (!CollectionUtils.isEmpty(child.getChildren())) {
                             for (AreaCodeDictResultDTO threeChild : child.getChildren()) {
-                                if (rootAreaCode.equals(threeChild.getCode())){
+                                if (rootAreaCode.equals(threeChild.getCode())) {
                                     result.add(threeChild);
                                     return result;
                                 }
                                 // 街道获取
-                                if (!CollectionUtils.isEmpty(threeChild.getChildren())){
+                                if (!CollectionUtils.isEmpty(threeChild.getChildren())) {
                                     for (AreaCodeDictResultDTO fourChild : threeChild.getChildren()) {
-                                        if (rootAreaCode.equals(fourChild.getCode())){
+                                        if (rootAreaCode.equals(fourChild.getCode())) {
                                             result.add(fourChild);
                                             return result;
                                         }
                                         // 社区获取
-                                        if (!CollectionUtils.isEmpty(fourChild.getChildren())){
+                                        if (!CollectionUtils.isEmpty(fourChild.getChildren())) {
                                             for (AreaCodeDictResultDTO fiveChild : fourChild.getChildren()) {
-                                                if (rootAreaCode.equals(fiveChild.getCode())){
+                                                if (rootAreaCode.equals(fiveChild.getCode())) {
                                                     result.add(fiveChild);
                                                     return result;
                                                 }
@@ -304,40 +300,40 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     }
 
     @Override
-    public List<AreaCodeDictResultDTO> areaCodeDictTreePlus(AreaCodeDictFormDTO formDTO){
+    public List<AreaCodeDictResultDTO> areaCodeDictTreePlus(AreaCodeDictFormDTO formDTO) {
         List<AreaCodeDictResultDTO> tree = new ArrayList<>();
         String s = areaCodeRedis.get(AreaCodeConstant.THREE_SCREEN_TREE);
-        if (StringUtils.isNotBlank(s)){
-            tree = JSON.parseArray(s,AreaCodeDictResultDTO.class);
-        }else {
+        if (StringUtils.isNotBlank(s)) {
+            tree = JSON.parseArray(s, AreaCodeDictResultDTO.class);
+        } else {
             List<AreaCodeDictResultDTO> threeTree = beforeThreeTree();
-            areaCodeRedis.set(AreaCodeConstant.THREE_SCREEN_TREE,threeTree);
+            areaCodeRedis.set(AreaCodeConstant.THREE_SCREEN_TREE, threeTree);
             tree = threeTree;
         }
-        if (StringUtils.isBlank(formDTO.getRootAreaCode())){
+        if (StringUtils.isBlank(formDTO.getRootAreaCode())) {
             return tree;
         }
-        if (StringUtils.isBlank(formDTO.getRootAreaLevel())){
+        if (StringUtils.isBlank(formDTO.getRootAreaLevel())) {
             throw new RenException(AreaCodeConstant.ROOT_AGENCY_LEVEL_IS_LEVEL);
         }
         // 传参为街道-社区级
-        if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.STREET) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.COMMUNITY)){
+        if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.STREET) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.COMMUNITY)) {
             tree = disposeAfterTwoLevel(formDTO);
-        }else if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.CITY) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.DISTRICT)){
-            tree = disposeBeforeThreeLevelFinal(formDTO,tree);
-        }else {
-            throw new RenException(String.format(AreaCodeConstant.LEVEL_ERROR,formDTO.getRootAreaLevel()));
+        } else if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.CITY) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.DISTRICT)) {
+            tree = disposeBeforeThreeLevelFinal(formDTO, tree);
+        } else {
+            throw new RenException(String.format(AreaCodeConstant.LEVEL_ERROR, formDTO.getRootAreaLevel()));
         }
         return tree;
     }
 
     /**
-     * @Description  省市区三级联动查询
+     * @Description 省市区三级联动查询
      * @Param
      * @author zxc
      * @date 2021/1/11 上午9:35
      */
-    public List<AreaCodeDictResultDTO> beforeThreeTree(){
+    public List<AreaCodeDictResultDTO> beforeThreeTree() {
         // 查询所有省市区
         List<AreaCodeDTO> areaCodeDTOS = baseDao.selectAllArea();
         Map<String, List<AreaCodeDTO>> groupByCity = areaCodeDTOS.stream().collect(Collectors.groupingBy(AreaCodeDTO::getCityCode));
@@ -362,13 +358,13 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             cityDto.setChildren(threeSort);
             cityResult.add(cityDto);
         });
-        groupByProvince.forEach((p,v) -> {
+        groupByProvince.forEach((p, v) -> {
             AreaCodeDictResultDTO dto = new AreaCodeDictResultDTO();
             dto.setCode(p);
             dto.setName(v.get(NumConstant.ZERO).getProvinceName());
             List<AreaCodeDictResultDTO> cityOnceResult = new ArrayList<>();
             cityResult.forEach(c -> {
-                if (dto.getCode().equals(c.getParentCode())){
+                if (dto.getCode().equals(c.getParentCode())) {
                     cityOnceResult.add(c);
                 }
             });
@@ -383,12 +379,12 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     }
 
     /**
-     * @Description  街道-社区组织树查询
+     * @Description 街道-社区组织树查询
      * @Param
      * @author zxc
      * @date 2021/1/11 上午9:48
      */
-    public List<AreaCodeDictResultDTO> afterTwoTree(AreaCodeDictFormDTO form){
+    public List<AreaCodeDictResultDTO> afterTwoTree(AreaCodeDictFormDTO form) {
         // 查询所有街道、社区
         List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild(form.getRootAreaCode());
         List<AreaCodeDictResultDTO> fourResult = new ArrayList<>();
@@ -399,7 +395,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
         List<AreaCodeChildDTO> levelFive = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FIVE)) ? groupByLevel.get(NumConstant.FIVE) : new ArrayList<>();
         Map<String, List<AreaCodeChildDTO>> groupByPCode = CollectionUtils.isEmpty(levelFive) ? new HashMap<>() : levelFive.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode));
         //街道
-        List<AreaCodeChildDTO> levelFour = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FOUR)) ?groupByLevel.get(NumConstant.FOUR):new ArrayList<>();
+        List<AreaCodeChildDTO> levelFour = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FOUR)) ? groupByLevel.get(NumConstant.FOUR) : new ArrayList<>();
         // 6级
         List<AreaCodeChildDTO> levelSix = groupByLevel.get(NumConstant.SIX);
         Map<String, List<AreaCodeChildDTO>> groupBySixPCode = CollectionUtils.isEmpty(levelSix) ? new HashMap<>() : levelSix.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode));
@@ -409,8 +405,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             dto.setCode(f.getCode());
             dto.setName(f.getName());
             dto.setParentCode(f.getPCode());
-            groupBySixPCode.forEach((k,v) -> {
-                if (dto.getCode().equals(k)){
+            groupBySixPCode.forEach((k, v) -> {
+                if (dto.getCode().equals(k)) {
                     List<AreaCodeDictResultDTO> six = new ArrayList<>();
                     v.forEach(s -> {
                         AreaCodeDictResultDTO sixDto = new AreaCodeDictResultDTO();
@@ -431,8 +427,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             dto.setCode(four.getCode());
             dto.setName(four.getName());
             dto.setParentCode(four.getPCode());
-            groupByFivePCode.forEach((pCode,v) -> {
-                if (dto.getCode().equals(pCode)){
+            groupByFivePCode.forEach((pCode, v) -> {
+                if (dto.getCode().equals(pCode)) {
                     dto.setChildren(v);
                 }
             });
@@ -443,28 +439,28 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     }
 
     /**
-     * @Description  街道-社区组织树处理
+     * @Description 街道-社区组织树处理
      * @Param form
      * @author zxc
      * @date 2021/1/11 上午9:58
      */
-    public List<AreaCodeDictResultDTO> disposeAfterTwoLevel(AreaCodeDictFormDTO form){
+    public List<AreaCodeDictResultDTO> disposeAfterTwoLevel(AreaCodeDictFormDTO form) {
         List<AreaCodeDictResultDTO> result = new ArrayList<>();
         List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = afterTwoTree(form);
-        if (CollectionUtils.isEmpty(areaCodeDictResultDTOS)){
+        if (CollectionUtils.isEmpty(areaCodeDictResultDTOS)) {
             return new ArrayList<>();
         }
-        if (form.getRootAreaLevel().equals(AreaCodeConstant.STREET)){
+        if (form.getRootAreaLevel().equals(AreaCodeConstant.STREET)) {
             for (AreaCodeDictResultDTO dto : areaCodeDictResultDTOS) {
-                if (dto.getCode().equals(form.getRootAreaCode())){
+                if (dto.getCode().equals(form.getRootAreaCode())) {
                     result.add(dto);
                 }
             }
-        }else {
+        } else {
             for (AreaCodeDictResultDTO dto : areaCodeDictResultDTOS) {
-                if (!CollectionUtils.isEmpty(dto.getChildren())){
+                if (!CollectionUtils.isEmpty(dto.getChildren())) {
                     for (AreaCodeDictResultDTO child : dto.getChildren()) {
-                        if (child.getCode().equals(form.getRootAreaCode())){
+                        if (child.getCode().equals(form.getRootAreaCode())) {
                             result.add(child);
                         }
                     }
@@ -475,42 +471,42 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     }
 
     /**
-     * @Description  省市区获取
+     * @Description 省市区获取
      * @Param form
      * @Param tree
      * @author zxc
      * @date 2021/1/12 上午9:22
      */
-    public List<AreaCodeDictResultDTO> disposeBeforeThreeLevel(AreaCodeDictFormDTO form,List<AreaCodeDictResultDTO> tree){
+    public List<AreaCodeDictResultDTO> disposeBeforeThreeLevel(AreaCodeDictFormDTO form, List<AreaCodeDictResultDTO> tree) {
         List<AreaCodeDictResultDTO> result = new ArrayList<>();
-        if (CollectionUtils.isEmpty(tree)){
+        if (CollectionUtils.isEmpty(tree)) {
             return new ArrayList<>();
         }
-        if (form.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE)){
+        if (form.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE)) {
             for (AreaCodeDictResultDTO dto : tree) {
-                if (dto.getCode().equals(form.getRootAreaCode())){
+                if (dto.getCode().equals(form.getRootAreaCode())) {
                     result.add(dto);
                     return result;
                 }
             }
-        }else if (form.getRootAreaLevel().equals(AreaCodeConstant.CITY)){
+        } else if (form.getRootAreaLevel().equals(AreaCodeConstant.CITY)) {
             for (AreaCodeDictResultDTO dto : tree) {
-                if (!CollectionUtils.isEmpty(dto.getChildren())){
+                if (!CollectionUtils.isEmpty(dto.getChildren())) {
                     for (AreaCodeDictResultDTO city : dto.getChildren()) {
-                        if (city.getCode().equals(form.getRootAreaCode())){
+                        if (city.getCode().equals(form.getRootAreaCode())) {
                             result.add(city);
                             return result;
                         }
                     }
                 }
             }
-        }else if (form.getRootAreaLevel().equals(AreaCodeConstant.DISTRICT)){
+        } else if (form.getRootAreaLevel().equals(AreaCodeConstant.DISTRICT)) {
             for (AreaCodeDictResultDTO dto : tree) {
-                if (!CollectionUtils.isEmpty(dto.getChildren())){
+                if (!CollectionUtils.isEmpty(dto.getChildren())) {
                     for (AreaCodeDictResultDTO city : dto.getChildren()) {
-                        if (!CollectionUtils.isEmpty(city.getChildren())){
+                        if (!CollectionUtils.isEmpty(city.getChildren())) {
                             for (AreaCodeDictResultDTO child : city.getChildren()) {
-                                if (child.getCode().equals(form.getRootAreaCode())){
+                                if (child.getCode().equals(form.getRootAreaCode())) {
                                     result.add(child);
                                     return result;
                                 }
@@ -524,29 +520,29 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     }
 
     /**
-     * @Description  拼接 街道-社区
+     * @Description 拼接 街道-社区
      * @Param form
      * @Param tree
      * @author zxc
      * @date 2021/1/12 上午9:21
      */
-    public List<AreaCodeDictResultDTO> disposeBeforeThreeLevelFinal(AreaCodeDictFormDTO form,List<AreaCodeDictResultDTO> tree){
+    public List<AreaCodeDictResultDTO> disposeBeforeThreeLevelFinal(AreaCodeDictFormDTO form, List<AreaCodeDictResultDTO> tree) {
         List<AreaCodeDictResultDTO> threeDto = disposeBeforeThreeLevel(form, tree);
         List<AreaCodeDictResultDTO> twoDto = afterTwoTree(form);
-        if (CollectionUtils.isEmpty(threeDto)){
+        if (CollectionUtils.isEmpty(threeDto)) {
             return new ArrayList<>();
         }
-        if (!CollectionUtils.isEmpty(twoDto)){
-            if (form.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE)){
+        if (!CollectionUtils.isEmpty(twoDto)) {
+            if (form.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE)) {
                 for (AreaCodeDictResultDTO dto : tree) {
-                    if (dto.getCode().equals(form.getRootAreaCode())){
-                        if (!CollectionUtils.isEmpty(dto.getChildren())){
+                    if (dto.getCode().equals(form.getRootAreaCode())) {
+                        if (!CollectionUtils.isEmpty(dto.getChildren())) {
                             for (AreaCodeDictResultDTO city : dto.getChildren()) {
-                                if (!CollectionUtils.isEmpty(city.getChildren())){
+                                if (!CollectionUtils.isEmpty(city.getChildren())) {
                                     for (AreaCodeDictResultDTO child : city.getChildren()) {
                                         List<AreaCodeDictResultDTO> areaList = new ArrayList<>();
                                         for (AreaCodeDictResultDTO area : twoDto) {
-                                            if (child.getCode().equals(area.getParentCode())){
+                                            if (child.getCode().equals(area.getParentCode())) {
                                                 areaList.add(area);
                                             }
                                         }
@@ -557,13 +553,13 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
                         }
                     }
                 }
-            }else if (form.getRootAreaLevel().equals(AreaCodeConstant.CITY)){
+            } else if (form.getRootAreaLevel().equals(AreaCodeConstant.CITY)) {
                 for (AreaCodeDictResultDTO dto : threeDto) {
-                    if (!CollectionUtils.isEmpty(dto.getChildren())){
+                    if (!CollectionUtils.isEmpty(dto.getChildren())) {
                         for (AreaCodeDictResultDTO child : dto.getChildren()) {
                             List<AreaCodeDictResultDTO> areaList = new ArrayList<>();
                             for (AreaCodeDictResultDTO area : twoDto) {
-                                if (child.getCode().equals(area.getParentCode())){
+                                if (child.getCode().equals(area.getParentCode())) {
                                     areaList.add(area);
                                 }
                             }
@@ -571,11 +567,11 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
                         }
                     }
                 }
-            }else{
+            } else {
                 for (AreaCodeDictResultDTO dto : threeDto) {
                     List<AreaCodeDictResultDTO> areaList = new ArrayList<>();
                     for (AreaCodeDictResultDTO area : twoDto) {
-                        if (dto.getCode().equals(area.getParentCode())){
+                        if (dto.getCode().equals(area.getParentCode())) {
                             areaList.add(area);
                         }
                     }
@@ -677,35 +673,35 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
         String areaCode = "";
         switch (formDTO.getCurrentAreaLevel()) {
             case AreaCodeConstant.DISTRICT:
-                areaCode = addDistrictAreaCode(formDTO.getParentAreaCode(),formDTO.getName());
+                areaCode = addDistrictAreaCode(formDTO.getParentAreaCode(), formDTO.getName());
                 break;
             case AreaCodeConstant.STREET:
-                areaCode = addStreetCommAreaCode(ConvertUtils.sourceToTarget(formDTO,AddAreaCodeDictFormDTO.class));
+                areaCode = addStreetCommAreaCode(ConvertUtils.sourceToTarget(formDTO, AddAreaCodeDictFormDTO.class));
                 break;
             case AreaCodeConstant.COMMUNITY:
-                areaCode = addStreetCommAreaCode(ConvertUtils.sourceToTarget(formDTO,AddAreaCodeDictFormDTO.class));
+                areaCode = addStreetCommAreaCode(ConvertUtils.sourceToTarget(formDTO, AddAreaCodeDictFormDTO.class));
                 break;
             default:
-                log.info("currentAreaLevel值为"+formDTO.getCurrentAreaLevel());
+                log.info("currentAreaLevel值为" + formDTO.getCurrentAreaLevel());
         }
         return areaCode;
     }
 
     @Override
     public List<AreaCodeResultDTO> nextArea(AreaCodeFormDTO formDTO) {
-        if(StringUtils.isBlank(formDTO.getParentAreaCode())&&StringUtils.isBlank(formDTO.getParentLevel())){
-            String pKey=RedisKeys.getNextAreaCodeKey(NumConstant.ZERO_STR);
-            List<AreaCodeResultDTO> list=areaCodeRedis.getNextAreaCodeKey(pKey);
-            if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)){
+        if (StringUtils.isBlank(formDTO.getParentAreaCode()) && StringUtils.isBlank(formDTO.getParentLevel())) {
+            String pKey = RedisKeys.getNextAreaCodeKey(NumConstant.ZERO_STR);
+            List<AreaCodeResultDTO> list = areaCodeRedis.getNextAreaCodeKey(pKey);
+            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)) {
                 return list;
             }
-            List<AreaCodeResultDTO> pList=baseDao.selectProvince();
-            areaCodeRedis.setNextAreaCodeKey(pKey,pList);
+            List<AreaCodeResultDTO> pList = baseDao.selectProvince();
+            areaCodeRedis.setNextAreaCodeKey(pKey, pList);
             return pList;
         }
-        String key=RedisKeys.getNextAreaCodeKey(formDTO.getParentAreaCode());
-        List<AreaCodeResultDTO> list=areaCodeRedis.getNextAreaCodeKey(key);
-        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)){
+        String key = RedisKeys.getNextAreaCodeKey(formDTO.getParentAreaCode());
+        List<AreaCodeResultDTO> list = areaCodeRedis.getNextAreaCodeKey(key);
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)) {
             return list;
         }
         switch (formDTO.getParentLevel()) {
@@ -723,17 +719,116 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
                 break;
             case AreaCodeConstant.COMMUNITY:
                 log.info("社区无下级");
-                list=null;
+                list = null;
                 break;
             default:
-                log.warn("parentLevel错误："+formDTO.getParentLevel());
+                log.warn("parentLevel错误：" + formDTO.getParentLevel());
         }
-        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)){
-            areaCodeRedis.setNextAreaCodeKey(key,list);
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)) {
+            areaCodeRedis.setNextAreaCodeKey(key, list);
         }
         return list;
     }
 
+    @Override
+    public AreaCodeResultDTO getAreaCodeDetail(AreaCodeDetailFormDTO formDTO) {
+        AreaCodeResultDTO result = new AreaCodeResultDTO();
+        switch (formDTO.getLevel()) {
+            case AreaCodeConstant.PROVINCE:
+                AreaCodeDTO province = baseDao.selectByProvinceCode(formDTO.getAreaCode());
+                if (province != null) {
+                    result.setAreaName(province.getProvinceName());
+                    result.setAreaCode(province.getProvinceCode());
+                    result.setParentCode(NumConstant.ZERO_STR);
+                    result.setLevel(AreaCodeConstant.PROVINCE);
+                }
+                break;
+            case AreaCodeConstant.CITY:
+                AreaCodeDTO city = baseDao.selectByCityCode(formDTO.getAreaCode());
+                if (city != null) {
+                    result.setAreaName(city.getCityName());
+                    result.setAreaCode(city.getCityName());
+                    result.setParentCode(city.getProvinceCode());
+                    result.setLevel(AreaCodeConstant.CITY);
+                }
+                break;
+            case AreaCodeConstant.DISTRICT:
+                AreaCodeDTO county = baseDao.selectByCountyCode(formDTO.getAreaCode());
+                if (county != null) {
+                    result.setAreaName(county.getCountyName());
+                    result.setAreaCode(county.getCountyCode());
+                    result.setParentCode(county.getCityCode());
+                    result.setLevel(AreaCodeConstant.DISTRICT);
+                }
+                break;
+            case AreaCodeConstant.STREET:
+                result = baseDao.selectByStreetCode(formDTO.getAreaCode());
+                break;
+            case AreaCodeConstant.COMMUNITY:
+                result = baseDao.selectByCommunityCode(formDTO.getAreaCode());
+                break;
+            default:
+                log.warn("Level错误：" + formDTO.getLevel());
+        }
+        return result;
+    }
+
+    @Override
+    public List<CustomerTreeDTO> getAreaCodeTree(CustomerTreeDTO formDTO) {
+        List<AreaCodeResultDTO> tree = new ArrayList<>();
+        areaCodeHandle(formDTO.getLevel(), formDTO.getAreaCode(), tree);
+        return ConvertUtils.sourceToTarget(tree, CustomerTreeDTO.class);
+    }
+
+    private void areaCodeHandle(String level, String areaCode, List<AreaCodeResultDTO> tree) {
+        AreaCodeResultDTO result = new AreaCodeResultDTO();
+        switch (level) {
+            case AreaCodeConstant.PROVINCE:
+                AreaCodeDTO province = baseDao.selectByProvinceCode(areaCode);
+                if (province != null) {
+                    result.setAreaName(province.getProvinceName());
+                    result.setAreaCode(province.getProvinceCode());
+                    result.setParentCode(NumConstant.ZERO_STR);
+                    result.setLevel(AreaCodeConstant.PROVINCE);
+                    tree.add(result);
+                }
+                break;
+            case AreaCodeConstant.CITY:
+                AreaCodeDTO city = baseDao.selectByCityCode(areaCode);
+                if (city != null) {
+                    result.setAreaName(city.getCityName());
+                    result.setAreaCode(city.getCityCode());
+                    result.setParentCode(city.getProvinceCode());
+                    result.setLevel(AreaCodeConstant.CITY);
+                    tree.add(result);
+                    areaCodeHandle(AreaCodeConstant.PROVINCE, city.getProvinceCode(), tree);
+                }
+                break;
+            case AreaCodeConstant.DISTRICT:
+                AreaCodeDTO county = baseDao.selectByCountyCode(areaCode);
+                if (county != null) {
+                    result.setAreaName(county.getCountyName());
+                    result.setAreaCode(county.getCountyCode());
+                    result.setParentCode(county.getCityCode());
+                    result.setLevel(AreaCodeConstant.DISTRICT);
+                    tree.add(result);
+                    areaCodeHandle(AreaCodeConstant.CITY, county.getCityCode(), tree);
+                }
+                break;
+            case AreaCodeConstant.STREET:
+                result = baseDao.selectByStreetCode(areaCode);
+                tree.add(result);
+                areaCodeHandle(AreaCodeConstant.DISTRICT, result.getParentCode(), tree);
+                break;
+            case AreaCodeConstant.COMMUNITY:
+                result = baseDao.selectByCommunityCode(areaCode);
+                tree.add(result);
+                areaCodeHandle(AreaCodeConstant.STREET, result.getParentCode(), tree);
+                break;
+            default:
+                log.warn("Level错误：" + level);
+        }
+    }
 
     private String addDistrictAreaCode(String cityCode, String countyName) {
         AreaCodeDTO city = baseDao.selectByCityCode(cityCode);
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml
index 34877f6c08..052b4369f7 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml
@@ -20,6 +20,16 @@
             and m.`CODE`=#{code}
     </select>
 
+    <select id="getByCode" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+        SELECT
+            *
+        FROM
+            area_code_child m
+        WHERE
+            m.DEL_FLAG = '0'
+            and m.`CODE`= #{code}
+    </select>
+
     <!--   根据p_code、name查询社区列表 -->
     <select id="selectByPCodeAndName" resultType="com.epmet.dto.AreaCodeChildDTO">
         SELECT
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
index 324edf5f0f..629b1edb04 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
@@ -19,6 +19,13 @@
         and ac.CITY_CODE=#{cityCode}
     </select>
 
+    <select id="selectByProvinceCode" resultType="com.epmet.dto.AreaCodeDTO">
+        select distinct ac.PROVINCE_CODE,ac.PROVINCE_NAME
+        from area_code ac
+        where ac.DEL_FLAG='0'
+        and ac.PROVINCE_CODE=#{provinceCode}
+    </select>
+
     <select id="selectMaxCounty" resultType="com.epmet.dto.AreaCodeDTO" parameterType="java.lang.String">
         select *
         from area_code ac
@@ -106,4 +113,28 @@
         ORDER BY
             ac.`code` ASC
     </select>
+    <select id="selectByStreetCode"  resultType="com.epmet.dto.result.AreaCodeResultDTO">
+        SELECT
+        ac.`code` AS areaCode,
+        ac.`name` AS areaName,
+        ac.p_code AS parentCode,
+        'street' AS LEVEL
+        FROM
+        area_code_child ac
+        WHERE
+        ac.DEL_FLAG = '0'
+        AND ac.`code` = #{streetCode}
+    </select>
+    <select id="selectByCommunityCode" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+        SELECT
+        ac.`code` AS areaCode,
+        ac.`name` AS areaName,
+        ac.p_code AS parentCode,
+        'street' AS LEVEL
+        FROM
+        area_code_child ac
+        WHERE
+        ac.DEL_FLAG = '0'
+        AND ac.`code` = #{communityCode}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInfoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInfoFormDTO.java
index e1dd0ea53d..0d220b193d 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInfoFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInfoFormDTO.java
@@ -16,4 +16,5 @@ public class HouseInfoFormDTO implements Serializable {
 
     @NotNull(message = "房屋编码不可为空")
     private String houseCode;
+    private String userId;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseInfoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseInfoFormDTO.java
index adde362546..3df20aa3b2 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseInfoFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseInfoFormDTO.java
@@ -22,5 +22,5 @@ public class IcHouseInfoFormDTO extends PageFormDTO {
     private String houseCode;
 
     private String customerId;
-
+    private String userId;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAreaResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAreaResultDTO.java
new file mode 100644
index 0000000000..3eaaf991df
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAreaResultDTO.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 组织信息
+ *
+ * @author sun
+ */
+@Data
+public class AgencyAreaResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 上级组织机构ID
+     */
+    private String pid;
+
+    /**
+     * 所有上级组织机构ID(以英文:隔开)
+     */
+    private String pids;
+
+    /**
+     * 所有上级名称,以-连接
+     */
+    private String allParentName;
+
+    /**
+     * 组织名称
+     */
+    private String organizationName;
+
+    /**
+     * 机关级别（社区级：community，
+     乡（镇、街道）级:street,
+     区县级: district,
+     市级: city
+     省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String level;
+
+    /**
+     * 地区编码
+     */
+    private String areaCode;
+
+    /**
+     * 总人数
+     */
+    private Integer totalUser;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 【城市】名称
+     */
+    private String city;
+
+    /**
+     * 【区县】名称
+     */
+    private String district;
+
+    /**
+     * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+     */
+    private String parentAreaCode;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 【社区】名称0409
+     */
+    private String community;
+
+    /**
+     * 组织编码
+     */
+    private String code;
+
+    /**
+     * 负责人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java
index ddb4af560e..e827b468ef 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java
@@ -108,4 +108,8 @@ public class HouseInfoResultDTO implements Serializable {
      * 房屋可编辑编码
      */
     private String coding;
+    /**
+     * 是否是房主
+     */
+    private String isOwner = "0";
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseInfoResultDTO.java
index d958f1494b..c3c77e446f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseInfoResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseInfoResultDTO.java
@@ -59,7 +59,16 @@ public class IcHouseInfoResultDTO implements Serializable {
      * 客户id
      */
     private String customerId;
+    private String isOwner = "0";
+    private String ownerIdCard;
+    /**
+     * 房屋编码
+     */
+    private String houseCode;
+    /**
+     * 二维码地址
+     */
+    private String qrCodeUrl;
 
-
-
+    private String coding;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index b7c17a255d..7e2bcae37e 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -695,4 +695,14 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/coverage/dictinit/{customerId}")
     Result dictInit(@PathVariable(value = "customerId") String customerId);
+
+    /**
+     * 获取房主名下的房屋
+     * @Param formDTO
+     * @Return {@link Result< List<HouseInfoDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2022/7/20 9:52
+     */
+    @PostMapping("/gov/org/ichouse/getOwnerHouseList")
+    Result<List<HouseInfoDTO>> getOwnerHouseList(@RequestBody IcHouseDTO formDTO);
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 0a8e690f38..f9046d5979 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -445,4 +445,18 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "dictInit", customerId);
     }
 
+    /**
+     * 获取房主名下的房屋
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link Result< List<HouseInfoDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2022/7/20 9:52
+     */
+    @Override
+    public Result<List<HouseInfoDTO>> getOwnerHouseList(IcHouseDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getOwnerHouseList", formDTO);
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index 1ff1bc303c..ae07816fa2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -505,4 +505,33 @@ public class AgencyController {
         List<AgencyAddressBookTreeResultDTO> dto = agencyService.getAddressTree(name, customerId);
         return new Result<List<AgencyAddressBookTreeResultDTO>>().ok(dto);
     }
+
+    /**
+     * 获取区域编码下级的所有客户信息
+     *
+     * @param areaCode
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.AgencyAreaResultDTO>>
+     * @author zhy
+     * @date 2022/7/7 10:12
+     */
+    @GetMapping("/areasubagency/{areaCode}")
+    public Result<List<AgencyAreaResultDTO>> getAreaSubAgency(@LoginUser TokenDto tokenDto, @PathVariable String areaCode) {
+        List<AgencyAreaResultDTO> dto = agencyService.getAreaSubAgency(tokenDto, areaCode);
+        return new Result<List<AgencyAreaResultDTO>>().ok(dto);
+    }
+
+    /**
+     * 客户树
+     *
+     * @param
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.CustomerRelationTreeDTO>>
+     * @author zhy
+     * @date 2022/7/6 13:24
+     */
+    @RequestMapping("customertree")
+    public Result<List<CustomerTreeDTO>> customerTree(@LoginUser TokenDto tokenDto) {
+        return new Result<List<CustomerTreeDTO>>().ok(agencyService.getCustomerTree(tokenDto));
+    }
+
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
index bd04087da4..62dfafccdf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@@ -516,6 +516,7 @@ public class HouseController implements ResultDataResolver {
         //效验数据
         ValidatorUtils.validateEntity(formDTO);
         formDTO.setCustomerId(loginUser.getCustomerId());
+        formDTO.setUserId(loginUser.getUserId());
         return houseService.getHouseInfoByCode(formDTO);
 
     }
@@ -569,7 +570,8 @@ public class HouseController implements ResultDataResolver {
      * @return com.epmet.commons.tools.utils.Result
      */
     @PostMapping("getHomeInfoByHouseCode")
-    public Result getHomeInfoByHouseCode(@RequestBody HouseInfoFormDTO dto) {
+    public Result getHomeInfoByHouseCode(@LoginUser TokenDto tokenDto, @RequestBody HouseInfoFormDTO dto) {
+        dto.setUserId(tokenDto.getUserId());
         //效验数据
         ValidatorUtils.validateEntity(dto);
         return houseService.getHomeInfoByHouseCode(dto);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
index 63668ceba1..49e3f15f92 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
@@ -24,6 +24,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseAgencyInfoResultDTO;
+import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.service.IcHouseService;
@@ -121,4 +122,18 @@ public class IcHouseController {
     public Result<Integer> updateIcHouseResiNumber(@RequestBody List<Map<String,Object>> paramList){
         return new Result<Integer>().ok(icHouseService.updateIcHouseResiNumber(paramList));
     }
+
+
+    /**
+     * 获取房主名下的房屋
+     *
+     * @Param idCards
+     * @Return {@link Result< List< HouseInfoDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2022/7/19 17:39
+     */
+    @PostMapping("getOwnerHouseList")
+    public Result<List<HouseInfoDTO>> getOwnerHouseList(@RequestBody IcHouseDTO formDTO){
+        return new Result<List<HouseInfoDTO>>().ok(icHouseService.getOwnerHouseList(formDTO));
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 1c4aa9394c..3059b5a1cf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -353,5 +353,28 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     CommunityInfoResultDTO getCommunityInfo(OrgInfoPointFormDTO formDTO);
 
     CommunityInfoResultDTO getCommunityInfoByUserId(@Param("userId") String userId);
+
+    /**
+     * 获取区域编码下级的所有客户信息
+     *
+     * @param areaCode
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.AgencyAreaResultDTO>>
+     * @author zhy
+     * @date 2022/7/7 10:12
+     */
+    List<AgencyAreaResultDTO> getAreaSubAgency(@Param("areaCode") String areaCode);
+
+    /**
+     * 客户树根节点
+     *
+     * @param
+     * @return java.util.List<com.epmet.dto.result.CustomerTreeDTO>
+     * @author zhy
+     * @date 2022/7/6 13:32
+     */
+    List<CustomerTreeDTO> selectRootCustomer(@Param("areaCode") String areaCode, @Param("level") String level);
+
+    CustomerAgencyEntity getAreaRootAgency(@Param("customerId") String customerId);
+
 }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
index 4ae4672647..04c73a7756 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
@@ -178,4 +178,25 @@ public interface AgencyService {
      * @date 2022/5/16 10:43
      */
     List<AgencyAddressBookTreeResultDTO> getAddressTree(String name, String customerId);
+
+    /**
+     * 获取区域编码下级的所有客户信息
+     *
+     * @param areaCode
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.AgencyAreaResultDTO>>
+     * @author zhy
+     * @date 2022/7/7 10:12
+     */
+    List<AgencyAreaResultDTO> getAreaSubAgency(TokenDto tokenDto, String areaCode);
+
+    /**
+     * 客户树
+     *
+     * @param tokenDto
+     * @return java.util.List<com.epmet.dto.result.CustomerTreeDTO>
+     * @author zhy
+     * @date 2022/7/6 13:32
+     */
+    List<CustomerTreeDTO> getCustomerTree(TokenDto tokenDto);
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
index 9aa68a4047..522acba117 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
@@ -7,6 +7,7 @@ import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseAgencyInfoResultDTO;
+import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -119,4 +120,14 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @return
      */
     Integer updateIcHouseResiNumber(List<Map<String, Object>> paramList);
+
+    /**
+     * 获取房主名下的房屋
+     *
+     * @Param formDTO
+     * @Return {@link List< HouseInfoDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/7/19 17:41
+     */
+    List<HouseInfoDTO> getOwnerHouseList(IcHouseDTO formDTO);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index cf2016de58..1505018fa9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -43,6 +43,7 @@ import com.epmet.dao.CustomerDepartmentDao;
 import com.epmet.dao.CustomerGridDao;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -50,12 +51,14 @@ import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerDepartmentEntity;
 import com.epmet.entity.CustomerGridEntity;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.service.AgencyService;
 import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerOrgParameterService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Joiner;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -66,10 +69,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 机关单位信息
@@ -99,7 +101,7 @@ public class AgencyServiceImpl implements AgencyService {
     @Autowired
     private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
     @Autowired
-    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    private OperCrmFeignClient operCrmFeignClient;
     @Autowired
     private IcBuildingDao icBuildingDao;
     @Autowired
@@ -902,6 +904,46 @@ public class AgencyServiceImpl implements AgencyService {
         return NodeTreeUtils.build(list);
     }
 
+    @Override
+    public List<AgencyAreaResultDTO> getAreaSubAgency(TokenDto tokenDto, String areaCode) {
+        if (NumConstant.ZERO_STR.equals(areaCode)) {
+            CustomerAgencyEntity root = customerAgencyDao.getAreaRootAgency(tokenDto.getCustomerId());
+            areaCode = root.getAreaCode();
+        }
+
+        List<AgencyAreaResultDTO> list = customerAgencyDao.getAreaSubAgency(areaCode);
+        list.forEach(item -> {
+            CustomerDTO customerDTO = new CustomerDTO();
+            customerDTO.setId(item.getCustomerId());
+            Result<CustomerDTO> customerResult = operCrmFeignClient.getCustomerInfo(customerDTO);
+            if (customerResult.success() && null != customerResult.getData()) {
+                item.setCustomerName(item.getOrganizationName().concat(StrConstant.HYPHEN).concat(customerResult.getData().getCustomerName()));
+            }
+        });
+
+        return list;
+    }
+
+    @Override
+    public List<CustomerTreeDTO> getCustomerTree(TokenDto tokenDto) {
+        List<CustomerTreeDTO> resultList = new ArrayList<>();
+        List<CustomerTreeDTO> rootList = customerAgencyDao.selectRootCustomer(null, null);
+        List<CustomerTreeDTO> treeList = new ArrayList<>();
+        Map<String, CustomerTreeDTO> treeMap = new HashMap<>();
+        if (!rootList.isEmpty()) {
+            // 获取已有客户的所有组织架构，并转换成map，保证唯一
+            rootList.forEach(item -> {
+                customerHandle(item, treeList);
+            });
+//            treeMap = treeList.stream().collect(Collectors.toMap(CustomerTreeDTO::getAreaCode, Function.identity(), (val1, val2) -> val2));
+            // 组合成组织树
+            resultList = getCustomerTree(treeList);
+
+        }
+
+        return resultList;
+    }
+
     private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) {
         CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
         insertEntity.setOrganizationName(formDTO.getAgencyName());
@@ -951,4 +993,109 @@ public class AgencyServiceImpl implements AgencyService {
         return insertEntity;
     }
 
+    /**
+     * 处理子客户
+     *
+     * @param customer
+     * @return com.epmet.dto.result.CustomerTreeDTO
+     * @author zhy
+     * @date 2022/7/6 13:54
+     */
+    private void customerHandle(CustomerTreeDTO customer, List<CustomerTreeDTO> treeList) {
+        Result<List<CustomerTreeDTO>> area = epmetCommonServiceOpenFeignClient.areaCodeTree(customer);
+        if (area.success()) {
+            if (area.getData() != null) {
+                treeList.addAll(area.getData());
+            }
+        }
+    }
+
+    /**
+     * 生成客户树
+     *
+     * @param
+     * @return com.epmet.dto.result.CustomerTreeDTO
+     * @author wgf
+     * @date 2022/7/6 13:54
+     */
+    private List<CustomerTreeDTO> getCustomerTree(List<CustomerTreeDTO> treeList) {
+        treeList = treeList.stream().distinct().collect(Collectors.toList());
+
+        // 回显客户名称
+        treeList.forEach(item -> {
+            List<String> customerNames = new ArrayList<>();
+            List<CustomerTreeDTO> subList = customerAgencyDao.selectRootCustomer(item.getAreaCode(), item.getLevel());
+            subList.forEach(customer -> {
+                CustomerDTO customerDTO = new CustomerDTO();
+                customerDTO.setId(customer.getCustomerId());
+                Result<CustomerDTO> customerResult = operCrmFeignClient.getCustomerInfo(customerDTO);
+                if (customerResult.success() && null != customerResult.getData()) {
+                    customerNames.add(customerResult.getData().getCustomerName());
+                }
+            });
+            item.setCustomerName(Joiner.on(",").join(customerNames));
+        });
+
+        // 省
+        List<CustomerTreeDTO> province = new ArrayList<CustomerTreeDTO>();
+        // 市
+        List<CustomerTreeDTO> city = new ArrayList<CustomerTreeDTO>();
+        // 区
+        List<CustomerTreeDTO> district = new ArrayList<CustomerTreeDTO>();
+        // 街道
+        List<CustomerTreeDTO> street = new ArrayList<CustomerTreeDTO>();
+        // 社区
+        List<CustomerTreeDTO> community = new ArrayList<CustomerTreeDTO>();
+        for (int i = 0; i < treeList.size(); i++) {
+            if ("province".equals(treeList.get(i).getLevel())) {
+                province.add(treeList.get(i));
+            } else if ("city".equals(treeList.get(i).getLevel())) {
+                city.add(treeList.get(i));
+            } else if ("district".equals(treeList.get(i).getLevel())) {
+                district.add(treeList.get(i));
+            } else if ("street".equals(treeList.get(i).getLevel())) {
+                street.add(treeList.get(i));
+            } else if ("community".equals(treeList.get(i).getLevel())) {
+                community.add(treeList.get(i));
+            }
+        }
+
+        // 组装街道树
+        for (CustomerTreeDTO streetDto : street) {
+            this.addChild(streetDto, community);
+        }
+        // 组装区树
+        for (CustomerTreeDTO districtDto : district) {
+            this.addChild(districtDto, street);
+        }
+        // 组装市树
+        for (CustomerTreeDTO cityDto : city) {
+            this.addChild(cityDto, district);
+        }
+        // 组装省树
+        for (CustomerTreeDTO provinceDto : province) {
+            this.addChild(provinceDto, city);
+        }
+
+        return province;
+    }
+
+
+    /**
+     * 组装子项
+     *
+     * @param parentDto
+     * @param childList
+     */
+    private void addChild(CustomerTreeDTO parentDto, List<CustomerTreeDTO> childList) {
+        List<CustomerTreeDTO> children = new ArrayList<CustomerTreeDTO>();
+        for (CustomerTreeDTO childDto : childList) {
+            if (parentDto.getAreaCode().equals(childDto.getParentCode())) {
+                children.add(childDto);
+            }
+        }
+        parentDto.setChildren(children);
+
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index c89d9eb8c4..652d1af545 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -20,10 +20,12 @@ import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerResiUserRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
+import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.CustomerGridConstant;
@@ -1058,9 +1060,23 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查询到相关房屋","未查询到相关房屋");
         }
         HouseInfoCache cache = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), house.getId());
-        IcHouseInfoResultDTO resut = ConvertUtils.sourceToTarget(cache, IcHouseInfoResultDTO.class);
-        resut.setHouseId(cache.getHomeId());
-        return new Result<IcHouseInfoResultDTO>().ok(resut);
+        if (null == cache) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查询到相关房屋","未查询到相关房屋");
+        }
+        IcHouseInfoResultDTO result = ConvertUtils.sourceToTarget(cache, IcHouseInfoResultDTO.class);
+        result.setHouseId(cache.getHomeId());
+        result.setOwnerIdCard(house.getOwnerIdCard());
+        result.setCoding(house.getCoding());
+        result.setHouseName(cache.getAllName());
+        result.setQrCodeUrl(house.getHouseQrcodeUrl());
+        ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(formDTO.getUserId());
+        if (null != userInfo) {
+            if (StringUtils.equals(house.getOwnerIdCard(), userInfo.getIdNum())) {
+                result.setIsOwner(NumConstant.ONE_STR);
+
+            }
+        }
+        return new Result<IcHouseInfoResultDTO>().ok(result);
     }
 
 
@@ -1137,6 +1153,12 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         house.setHouseTypeName(HouseTypeEnums.getTypeValue(house.getHouseType()));
         house.setRentName(HouseRentFlagEnums.getTypeValue(house.getRentFlag()));
         house.setPurposeName(HousePurposeEnums.getTypeValue(house.getPurpose()));
+        ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(dto.getUserId());
+        if (null != userInfo) {
+            if (StringUtils.equals(house.getOwnerIdCard(), userInfo.getIdNum())) {
+                house.setIsOwner(NumConstant.ONE_STR);
+            }
+        }
         return new Result().ok(house);
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 98e340221c..d93d589134 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -22,6 +22,7 @@ import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseAgencyInfoResultDTO;
+import com.epmet.dto.result.HomeInfoResultDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.dto.result.HousesNameResultDTO;
@@ -310,4 +311,26 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         log.debug("updateIcHouseResiNumber effectRow:{}", effects.intValue());
         return effects.intValue();
     }
+
+    /**
+     * 获取房主名下的房屋
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List<  HomeInfoResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2022/7/19 17:41
+     */
+    @Override
+    public List<HouseInfoDTO> getOwnerHouseList(IcHouseDTO formDTO) {
+        LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcHouseEntity::getCustomerId, formDTO.getCustomerId());
+        wrapper.eq(IcHouseEntity::getOwnerIdCard, formDTO.getOwnerIdCard());
+        wrapper.ne(IcHouseEntity::getHouseCode, formDTO.getHouseCode());
+        List<IcHouseEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> icHouseRedis.getHouseInfo(item.getId(), item.getCustomerId())).collect(Collectors.toList());
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 136341dc18..d0e2d2e34c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -930,4 +930,55 @@
         limit 1
     </select>
 
+    <select id="getAreaSubAgency" resultType="com.epmet.dto.result.AgencyAreaResultDTO">
+        SELECT
+            ac.*
+        FROM
+            customer_agency ac
+            INNER JOIN customer_org_parameter cop ON cop.CUSTOMER_ID = ac.CUSTOMER_ID
+        WHERE
+            ac.DEL_FLAG = '0'
+            AND cop.DEL_FLAG = '0'
+            AND cop.PARAMETER_KEY = 'area_code_switch'
+            AND ac.PID = '0'
+            AND cop.PARAMETER_VALUE = 'open'
+        <if test="areaCode != null and areaCode != ''">
+            AND ac.AREA_CODE LIKE CONCAT(#{areaCode}, '%')
+        </if>
+    </select>
+
+    <select id="selectRootCustomer" resultType="com.epmet.dto.result.CustomerTreeDTO">
+        SELECT
+            c.*
+        FROM
+            customer_agency c
+        WHERE
+            c.DEL_FLAG = '0'
+          AND c.pid = '0'
+          AND c.AREA_CODE IS NOT NULL
+        <if test="areaCode != null and areaCode != ''">
+            AND c.AREA_CODE = #{areaCode}
+        </if>
+        <if test="level != null and level != ''">
+            AND c.LEVEL = #{level}
+        </if>
+    </select>
+
+    <select id="getAreaRootAgency" resultType="com.epmet.entity.CustomerAgencyEntity">
+        SELECT
+        ac.*
+        FROM
+        customer_agency ac
+        INNER JOIN customer_org_parameter cop ON cop.CUSTOMER_ID = ac.CUSTOMER_ID
+        WHERE
+        ac.DEL_FLAG = '0'
+        AND cop.DEL_FLAG = '0'
+        AND cop.PARAMETER_KEY = 'area_code_switch'
+        AND ac.PID = '0'
+        AND cop.PARAMETER_VALUE = 'open'
+        <if test="customerId != null and customerId != ''">
+            AND ac.CUSTOMER_ID = #{customerId}
+        </if>
+    </select>
+
 </mapper>
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerRelationDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerRelationDTO.java
index 463ac3abc5..540e1c3b2f 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerRelationDTO.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerRelationDTO.java
@@ -83,6 +83,11 @@ public class CustomerRelationDTO implements Serializable {
      */
 	private String areaCode;
 
+    /**
+     * 当前客户的地区编码，实际就是根组织的area_code
+     */
+    private String parentAreaCode;
+
     /**
      * 删除标识0未删除1已删除
      */
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerRelationFormDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerRelationFormDTO.java
new file mode 100644
index 0000000000..817670541f
--- /dev/null
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerRelationFormDTO.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 客户关系表(01.14 add)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-02-03
+ */
+@Data
+public class CustomerRelationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java
new file mode 100644
index 0000000000..895e46051b
--- /dev/null
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 客户关系表(01.14 add)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-02-03
+ */
+@Data
+public class CustomerRelationTreeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 父级客户id;如果是顶级客户，此列=0
+     */
+	private String parentCustomerId;
+
+    /**
+     * 当前客户的所有父级客户id,以英文冒号隔开，如果是顶级客户，此列=0
+     */
+    private String pids;
+
+    /**
+     * 当前客户类型取值： external:外部客户，internal:内部客户
+     */
+	private String customerType;
+
+    /**
+     * 父级客户类型取值： external:外部客户，internal:内部客户;如果是顶级客户，此列=0
+     */
+	private String parentCustomerType;
+
+    /**
+     * open,closed是否启用
+     */
+	private String status;
+
+    /**
+     * 当前客户级别（社区级：community，
+乡（镇、街道）级:street,
+区县级: district,
+市级: city
+省级:province）
+     */
+	private String level;
+
+    /**
+     * 当前客户的地区编码，实际就是根组织的area_code
+     */
+	private String areaCode;
+
+    /**
+     * 当前客户的地区名称
+     */
+    private String areaName;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 有效期
+     */
+    private Date validityTime;
+
+    /**
+     * 客户logo
+     */
+    private String logo;
+
+    /**
+     * 下一级
+     */
+    private List<CustomerRelationTreeDTO> children;
+}
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
index c6fc44b140..cda0889b35 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
@@ -133,4 +133,16 @@ public interface OperCrmOpenFeignClient {
 	 **/
 	@GetMapping("/oper/crm/customer/getexternalandparentcustomerid/{customerId}")
 	Result<String> getExternalAndParentCustomerId(@PathVariable("customerId") String customerId);
+
+	/**
+	 * 获取子客户
+	 *
+	 * @param customerId
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
+	 * @author zhy
+	 * @date 2022/7/8 13:41
+	 */
+	@GetMapping("/oper/crm/customerRelation/subcustomer/{customerId}")
+	Result<List<String>> getSubCustomer(@PathVariable("customerId") String customerId);
+
 }
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
index 8366657fa8..380ed077fa 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
@@ -99,4 +99,9 @@ public class OperCrmOpenFeignClientFallback implements OperCrmOpenFeignClient {
 	public Result<String> getExternalAndParentCustomerId(String customerId) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getExternalAndParentCustomerId", customerId);
 	}
+
+	@Override
+	public Result<List<String>> getSubCustomer(String customerId) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getSubCustomer", customerId);
+	}
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index 4c5c659712..9d307af050 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -111,6 +111,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>common-service-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerRelationController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerRelationController.java
new file mode 100644
index 0000000000..e6a4bc2f25
--- /dev/null
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerRelationController.java
@@ -0,0 +1,104 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.CustomerRelationDTO;
+import com.epmet.dto.result.CustomerRelationTreeDTO;
+import com.epmet.service.CustomerRelationService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 客户关系表(01.14 add)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-06
+ */
+@RestController
+@RequestMapping("customerRelation")
+public class CustomerRelationController {
+
+    @Autowired
+    private CustomerRelationService customerRelationService;
+
+    @RequestMapping("page")
+    public Result<PageData<CustomerRelationDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<CustomerRelationDTO> page = customerRelationService.page(params);
+        return new Result<PageData<CustomerRelationDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<CustomerRelationDTO> get(@PathVariable("id") String id) {
+        CustomerRelationDTO data = customerRelationService.get(id);
+        return new Result<CustomerRelationDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody CustomerRelationDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        customerRelationService.saveV2(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody CustomerRelationDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        customerRelationService.update(dto);
+        return new Result();
+    }
+
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        customerRelationService.delete(ids);
+        return new Result();
+    }
+
+    /**
+     * 客户树
+     *
+     * @param
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.CustomerRelationTreeDTO>>
+     * @author zhy
+     * @date 2022/7/6 13:24
+     */
+    @RequestMapping("customertree")
+    public Result<List<CustomerRelationTreeDTO>> customerTree(@LoginUser TokenDto tokenDto) {
+        return new Result<List<CustomerRelationTreeDTO>>().ok(customerRelationService.getCustomerTree(tokenDto));
+    }
+
+    /**
+     * 获取子客户
+     *
+     * @param customerId
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
+     * @author zhy
+     * @date 2022/7/8 13:41
+     */
+    @GetMapping("subcustomer/{customerId}")
+    public Result<List<String>> getSubCustomer(@PathVariable("customerId") String customerId) {
+        if(StringUtils.isNotBlank(customerId)){
+            List<String> result = customerRelationService.getSubCustomer(customerId);
+            return new Result<List<String>>().ok(result);
+        }
+        return new Result<>();
+    }
+}
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerRelationDao.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerRelationDao.java
index 948937062c..ee8e6255ce 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerRelationDao.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerRelationDao.java
@@ -19,8 +19,10 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerRelationDTO;
+import com.epmet.dto.result.CustomerRelationTreeDTO;
 import com.epmet.entity.CustomerRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -48,4 +50,35 @@ public interface CustomerRelationDao extends BaseDao<CustomerRelationEntity> {
      * @return java.util.List<java.lang.String>
      */
     List<String> selectAllSubCustomerIds(String customerId);
+
+    /**
+     * 客户树根节点
+     *
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.result.CustomerRelationTreeDTO>
+     * @author zhy
+     * @date 2022/7/6 13:32
+     */
+    List<CustomerRelationTreeDTO> selectRootCustomerByCustomerId(@Param("customerId") String customerId);
+
+    /**
+     * 客户树子节点
+     *
+     * @param customerPid
+     * @return java.util.List<com.epmet.dto.result.CustomerRelationTreeDTO>
+     * @author zhy
+     * @date 2022/7/6 13:32
+     */
+    List<CustomerRelationTreeDTO> selectSubCustomerByPid(@Param("customerPid") String customerPid);
+
+    /**
+     * 获取子客户
+     *
+     * @param customerId
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
+     * @author zhy
+     * @date 2022/7/8 13:41
+     */
+    List<String> getSubCustomer(@Param("customerId") String customerId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java
index 9c33664b50..1c0a077b14 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java
@@ -79,4 +79,9 @@ public class CustomerRelationEntity extends BaseEpmetEntity {
      */
 	private String areaCode;
 
+	/**
+	 * 当前客户的地区编码，实际就是根组织的area_code
+	 */
+	private String parentAreaCode;
+
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java
index 2776c8b0cf..05ee703d22 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java
@@ -19,7 +19,9 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.CustomerRelationDTO;
+import com.epmet.dto.result.CustomerRelationTreeDTO;
 import com.epmet.entity.CustomerRelationEntity;
 
 import java.util.List;
@@ -73,6 +75,16 @@ public interface CustomerRelationService extends BaseService<CustomerRelationEnt
      */
     void save(CustomerRelationDTO dto);
 
+    /**
+     * 默认保存-数据融合版本
+     *
+     * @param dto
+     * @return void
+     * @author zhy
+     * @date 2022/7/7 14:56
+     */
+    void saveV2(CustomerRelationDTO dto);
+
     /**
      * 默认更新
      *
@@ -121,4 +133,17 @@ public interface CustomerRelationService extends BaseService<CustomerRelationEnt
      * @Date 2021/2/3 21:37
      **/
     List<String> getAllSubCustomerIds(String customerId);
+
+    /**
+     * 客户树
+     *
+     * @param tokenDto
+     * @return java.util.List<com.epmet.dto.result.CustomerRelationTreeDTO>
+     * @author zhy
+     * @date 2022/7/6 13:32
+     */
+    List<CustomerRelationTreeDTO> getCustomerTree(TokenDto tokenDto);
+
+    List<String> getSubCustomer(String customerId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java
index 6a68df0455..415a6c831a 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java
@@ -25,11 +25,17 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerRelationDao;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.CustomerRelationDTO;
+import com.epmet.dto.form.AreaCodeDetailFormDTO;
+import com.epmet.dto.result.AreaCodeResultDTO;
+import com.epmet.dto.result.CustomerRelationTreeDTO;
 import com.epmet.entity.CustomerRelationEntity;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.redis.CustomerRedis;
 import com.epmet.service.CustomerRelationService;
 import com.epmet.service.CustomerService;
@@ -58,6 +64,8 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
     private CustomerRedis customerRedis;
     @Autowired
     private CustomerService customerService;
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
 
     @Override
     public PageData<CustomerRelationDTO> page(Map<String, Object> params) {
@@ -75,8 +83,8 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
         return ConvertUtils.sourceToTarget(entityList, CustomerRelationDTO.class);
     }
 
-    private QueryWrapper<CustomerRelationEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<CustomerRelationEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<CustomerRelationEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -97,6 +105,15 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
         insert(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveV2(CustomerRelationDTO dto) {
+        CustomerRelationEntity entity = ConvertUtils.sourceToTarget(dto, CustomerRelationEntity.class);
+        entity.setCustomerType("internal");
+        entity.setParentCustomerType("internal");
+        insert(entity);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(CustomerRelationDTO dto) {
@@ -134,12 +151,12 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
      */
     @Override
     public String getRootCustomerId(String customerId) {
-        CustomerRelationDTO customerRelationDTO=this.getByCustomerId(customerId);
+        CustomerRelationDTO customerRelationDTO = this.getByCustomerId(customerId);
         if (null == customerRelationDTO) {
-            log.info(String.format("根据客户id:%s查找customer_relation为空",customerId));
+            log.info(String.format("根据客户id:%s查找customer_relation为空", customerId));
             return StrConstant.EPMETY_STR;
         }
-        log.info(JSON.toJSONString(customerRelationDTO,true));
+        log.info(JSON.toJSONString(customerRelationDTO, true));
         if (!NumConstant.ZERO_STR.equals(customerRelationDTO.getParentCustomerId())) {
             log.info("parentCustomerId is not equals 0 so continue");
             return getRootCustomerId(customerRelationDTO.getParentCustomerId());
@@ -170,4 +187,46 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
         return new ArrayList<>();
     }
 
+    @Override
+    public List<CustomerRelationTreeDTO> getCustomerTree(TokenDto tokenDto) {
+//        String customerId = tokenDto.getCustomerId();
+        String customerId = "78e2b2227c07de1fe54da14e2b2d9eb6";
+        List<CustomerRelationTreeDTO> rootList = baseDao.selectRootCustomerByCustomerId(customerId);
+        if (!rootList.isEmpty()) {
+            rootList.forEach(this::getSubCustomer);
+        }
+        return rootList;
+    }
+
+    @Override
+    public List<String> getSubCustomer(String customerId) {
+        return baseDao.getSubCustomer(customerId);
+    }
+
+    /**
+     * 处理子客户
+     *
+     * @param customer
+     * @return com.epmet.dto.result.CustomerRelationTreeDTO
+     * @author zhy
+     * @date 2022/7/6 13:54
+     */
+    private CustomerRelationTreeDTO getSubCustomer(CustomerRelationTreeDTO customer) {
+        AreaCodeDetailFormDTO formDTO = new AreaCodeDetailFormDTO();
+        formDTO.setAreaCode(customer.getAreaCode());
+        formDTO.setLevel(customer.getLevel());
+        Result<AreaCodeResultDTO> area = epmetCommonServiceOpenFeignClient.areaCodeDetail(formDTO);
+        if (area.success()) {
+            if (area.getData() != null) {
+                customer.setAreaName(area.getData().getAreaName());
+            }
+        }
+        List<CustomerRelationTreeDTO> children = baseDao.selectSubCustomerByPid(customer.getCustomerId());
+        customer.setChildren(children);
+        if (!children.isEmpty()) {
+            children.forEach(this::getSubCustomer);
+        }
+        return customer;
+    }
+
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml
index f757a48b51..525e388cf4 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerRelationDao.xml
@@ -23,4 +23,46 @@
                 cr.DEL_FLAG = '0'
                 AND cr.PIDS like CONCAT(#{customerId},'%')
     </select>
+
+    <select id="selectRootCustomerByCustomerId" parameterType="java.lang.String" resultType="com.epmet.dto.result.CustomerRelationTreeDTO">
+        SELECT
+            cr.*,
+            c.CUSTOMER_NAME,
+            c.VALIDITY_TIME,
+            c.LOGO
+        FROM
+            customer_relation cr
+            LEFT JOIN customer c ON c.id = cr.CUSTOMER_ID
+        WHERE
+            cr.DEL_FLAG = '0'
+--             AND c.DEL_FLAG = '0'
+            AND cr.CUSTOMER_ID = #{customerId}
+    </select>
+
+    <select id="selectSubCustomerByPid" parameterType="java.lang.String" resultType="com.epmet.dto.result.CustomerRelationTreeDTO">
+        SELECT
+            cr.*,
+            c.CUSTOMER_NAME,
+            c.VALIDITY_TIME,
+            c.LOGO
+        FROM
+            customer_relation cr
+            LEFT JOIN customer c ON c.id = cr.CUSTOMER_ID
+        WHERE
+            cr.DEL_FLAG = '0'
+--             AND c.DEL_FLAG = '0'
+            AND cr.PARENT_CUSTOMER_ID = #{customerPid}
+    </select>
+
+    <select id="getSubCustomer" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT
+            CUSTOMER_ID
+        FROM
+            customer_relation
+        WHERE
+            `STATUS` = 'open'
+            AND FIND_IN_SET( #{customerId}, pids )
+            AND DEL_FLAG = '0'
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java
index ea119fbd80..e2bbad8810 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java
@@ -210,5 +210,5 @@ public class IcResiUserConfirmSubmitDTO implements Serializable {
     private String operationDescribe;
 
     private String houseCode;
-
+    private Boolean isOwner = false;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeInfoResultDTO.java
index e890aa3092..f6474161d8 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeInfoResultDTO.java
@@ -20,4 +20,12 @@ public class HomeInfoResultDTO implements Serializable {
     private String houseName;
     private String houseCode;
     private String qrCodeUrl;
+    /**
+     * 是否是房主
+     */
+    private String isOwner = "0";
+    /**
+     * 房主身份证
+     */
+    private String ownerIdCard;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RegisterAndBindResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RegisterAndBindResultDTO.java
new file mode 100644
index 0000000000..cb30766181
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RegisterAndBindResultDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/7/20 17:13
+ */
+@Data
+public class RegisterAndBindResultDTO implements Serializable {
+    private static final long serialVersionUID = 718455504517985543L;
+    private String isOwner = "0";
+    private String isDiff = "0";
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java
index a622798520..a2d754b2e9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java
@@ -10,12 +10,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.IcResiUserConfirmDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.ConfirmListResultDTO;
-import com.epmet.dto.result.HomeInfoResultDTO;
-import com.epmet.dto.result.HomeUserBriefResultDTO;
-import com.epmet.dto.result.MoveOutDetailResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.service.IcResiUserConfirmService;
 import com.epmet.service.IcResiUserService;
 import com.epmet.service.MyHomeService;
@@ -135,11 +133,10 @@ public class MyHomeController {
      * @Date 2022/6/1 10:26
      */
     @PostMapping("registerAndBind")
-    public Result registerAndBind(@LoginUser TokenDto tokenDto, @RequestBody RegisterAndBindFormDTO formDTO) {
+    public Result<RegisterAndBindResultDTO> registerAndBind(@LoginUser TokenDto tokenDto, @RequestBody RegisterAndBindFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        myHomeService.registerAndBind(formDTO);
-        return new Result();
+        return new Result<RegisterAndBindResultDTO>().ok(myHomeService.registerAndBind(formDTO));
     }
 
     @PostMapping("homeInfo")
@@ -200,4 +197,33 @@ public class MyHomeController {
         return new Result();
     }
 
+    /**
+     * 获取房主名下的房屋列表
+     *
+     * @Param tokenDto
+     * @Return {@link Result< HomeInfoResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/7/19 16:46
+     */
+    @PostMapping("getOwnerHouseList")
+    public Result<List<HomeInfoResultDTO>> getOwnerHouseList(@LoginUser TokenDto tokenDto, @RequestBody IcHouseDTO formDTO) {
+        List<HomeInfoResultDTO> result = myHomeService.getOwnerHouseList(tokenDto, formDTO);
+        return new Result<List<HomeInfoResultDTO>>().ok(result);
+    }
+
+    /**
+     * 变更绑定的房屋
+     *
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/7/20 17:28
+     */
+    @PostMapping("changeHome")
+    public Result changeHome(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserConfirmSubmitDTO formDTO) {
+        myHomeService.changeHome(tokenDto, formDTO);
+        return new Result();
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/MyHomeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/MyHomeService.java
index 0d1667b03d..a4f140670f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/MyHomeService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/MyHomeService.java
@@ -1,9 +1,12 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.form.IcResiUserConfirmSubmitDTO;
 import com.epmet.dto.form.RegisterAndBindFormDTO;
 import com.epmet.dto.result.HomeInfoResultDTO;
 import com.epmet.dto.result.HomeUserBriefResultDTO;
+import com.epmet.dto.result.RegisterAndBindResultDTO;
 
 import java.util.List;
 
@@ -21,7 +24,7 @@ public interface MyHomeService {
      * @Author zhaoqifeng
      * @Date 2022/6/1 16:33
      */
-    void registerAndBind(RegisterAndBindFormDTO formDTO);
+    RegisterAndBindResultDTO registerAndBind(RegisterAndBindFormDTO formDTO);
 
     /**
      * 获取用户绑定的房屋信息
@@ -43,4 +46,25 @@ public interface MyHomeService {
      * @date 2022/6/1/0001 16:12
      */
     List<HomeUserBriefResultDTO> selectListHomeMember(String houseCode, String customerId);
+
+    /**
+     * 获取房主名下的房屋列表
+     *
+     * @Param tokenDto
+     * @Return {@link List< HomeInfoResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/7/19 16:48
+     */
+    List<HomeInfoResultDTO> getOwnerHouseList(TokenDto tokenDto, IcHouseDTO formDTO);
+
+    /**
+     * 变更绑定的房屋
+     *
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/7/20 17:28
+     */
+    void changeHome(TokenDto tokenDto, IcResiUserConfirmSubmitDTO formDTO);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index d04771e4c9..86e7fdf169 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -41,10 +41,12 @@ import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerResiUserRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
+import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.IcPlatformConstant;
@@ -2391,17 +2393,83 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     public Result addMember(TokenDto tokenDto,IcResiUserConfirmSubmitDTO dto) {
-        IcResiUserEntity user = icResiUserDao.selectById(dto.getIcResiUserId());
+        IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(dto.getIdCard(), tokenDto.getCustomerId());
+        String idCard = "";
+        ResiUserInfoCache resiUserInfo = CustomerResiUserRedis.getUserBaseInfo(tokenDto.getUserId());
+        if (null != resiUserInfo) {
+            idCard = resiUserInfo.getIdNum();
+        }
+
+
+        Result<IcHouseDTO> icHouseNewResult = govOrgOpenFeignClient.get(dto.getHomeId());
+        if (!icHouseNewResult.success() || null == icHouseNewResult.getData()) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
+        }
+
+        HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), dto.getHomeId());
+        if (null == houseInfo) {
+            String errorMsg = "获取房屋信息失败";
+            throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
+        }
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(houseInfo.getGridId());
+        if (null == gridInfo) {
+            String errorMsg = "获取网格信息失败";
+            throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
+        }
+
+        dto.setCustomerId(tokenDto.getCustomerId());
+        dto.setAgencyId(houseInfo.getAgencyId());
+        dto.setPids(gridInfo.getPids());
+        dto.setGridId(houseInfo.getGridId());
+        dto.setVillageId(houseInfo.getNeighborHoodId());
+        dto.setBuildId(houseInfo.getBuildingId());
+        dto.setUnitId(houseInfo.getBuildingUnitId());
+        dto.setHomeId(dto.getHomeId());
+        dto.setStaffId(tokenDto.getUserId());
+        if (idCard.equals(icHouseNewResult.getData().getOwnerIdCard())) {
+            dto.setIsOwner(true);
+        }
 
-        IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(dto.getIdCard(), user.getCustomerId());
         if (null != userDTO && null != userDTO.getIdCard()) {
-            String errorMsg = "新增居民信息失败，身份证号已存在!";
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+            if (dto.getIsOwner()) {
+                //如果是房东，可以将其名下其他房屋的人员移到当前房屋
+                if (dto.getHomeId().equals(userDTO.getHomeId())) {
+                    String errorMsg = "新增居民信息失败，身份证号已存在!";
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                } else {
+                    //判断房屋的房主是否同一人
+                    Result<IcHouseDTO> icHouseResult = govOrgOpenFeignClient.get(userDTO.getHomeId());
+                    if (!icHouseResult.success() || null == icHouseResult.getData()) {
+                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
+                    }
+                    if (StringUtils.equals(icHouseResult.getData().getOwnerIdCard(), icHouseNewResult.getData().getOwnerIdCard())) {
+                        //走迁移逻辑
+                        //这个房屋下已经设置了户主后，再次选择户主时提示提示“房屋下已存在户主” PS.户主指与户主关系是本人的用户
+                        if (RelationshipEnum.SELF.getCode().equals(dto.getYhzgx())) {
+                            LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+                            wrapper.eq(IcResiUserEntity::getHomeId, dto.getHomeId());
+                            wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode());
+                            List<IcResiUserEntity> entityList = baseDao.selectList(wrapper);
+                            if (CollectionUtils.isNotEmpty(entityList)) {
+                                String errorMsg = "房屋下已存在户主";
+                                throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
+                            }
+                        }
+                        return updateOldMemberInfo(tokenDto.getCustomerId(),dto);
+                    } else {
+                        String errorMsg = "您无权操作其他家庭的成员，如有问题请联系工作人员";
+                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                    }
+                }
+            } else {
+                String errorMsg = "新增居民信息失败，身份证号已存在!";
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+            }
         }
         //这个房屋下已经设置了户主后，再次选择户主时提示提示“房屋下已存在户主” PS.户主指与户主关系是本人的用户
         if (RelationshipEnum.SELF.getCode().equals(dto.getYhzgx())) {
             LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId());
+            wrapper.eq(IcResiUserEntity::getHomeId, dto.getHomeId());
             wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode());
             List<IcResiUserEntity> entityList = baseDao.selectList(wrapper);
             if (CollectionUtils.isNotEmpty(entityList)) {
@@ -2411,15 +2479,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
 
 
-        dto.setCustomerId(user.getCustomerId());
-        dto.setAgencyId(user.getAgencyId());
-        dto.setPids(user.getPids());
-        dto.setGridId(user.getGridId());
-        dto.setVillageId(user.getVillageId());
-        dto.setBuildId(user.getBuildId());
-        dto.setUnitId(user.getUnitId());
-        dto.setHomeId(user.getHomeId());
-
         IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
         this.setIcResiUserPids(entity);
         insert(entity);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
index 5c3bada17e..2428c39fda 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
@@ -144,7 +144,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         }
         changeRecordEntity.setOperatorId(formDTO.getStaffId());
         changeRecordEntity.setIcUserId(formDTO.getIcUserId());
-        changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
+        changeRecordEntity.setOperatorName(null == staffInfoCache ? "" : staffInfoCache.getRealName());
         changeRecordEntity.setIcUserName(resiUserDTO.getName());
         changeRecordEntity.setType("transfer");
         changeRecordEntity.setTypeName("调动");
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
index 9ae1bba783..df072feb9e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
@@ -1,22 +1,22 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.IcResiUserConstant;
 import com.epmet.dao.*;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.UserResiInfoDTO;
-import com.epmet.dto.form.EnterGridFormDTO;
-import com.epmet.dto.form.GetRoleKeyListFormDTO;
-import com.epmet.dto.form.RegisterAndBindFormDTO;
-import com.epmet.dto.result.HomeInfoResultDTO;
-import com.epmet.dto.result.HomeUserBriefResultDTO;
-import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.entity.UserResiInfoEntity;
@@ -26,13 +26,18 @@ import com.epmet.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.Collator;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
 
 /**
  * @Description
@@ -63,6 +68,8 @@ public class MyHomeServiceImpl implements MyHomeService {
     private RegisterRelationService registerRelationService;
     @Resource
     private UserResiRegisterVisitDao userResiRegisterVisitDao;
+    @Resource
+    IcUserTransferRecordService icUserTransferRecordService;
 
     @Override
     public List<HomeUserBriefResultDTO> selectListHomeMember(String houseCode, String customerId) {
@@ -86,18 +93,42 @@ public class MyHomeServiceImpl implements MyHomeService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void registerAndBind(RegisterAndBindFormDTO formDTO) {
-
+    public RegisterAndBindResultDTO registerAndBind(RegisterAndBindFormDTO formDTO) {
+        RegisterAndBindResultDTO result = new RegisterAndBindResultDTO();
         LambdaQueryWrapper<IcResiUserEntity> userWrapper = new LambdaQueryWrapper<>();
         userWrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId());
         userWrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard());
         IcResiUserEntity icUser = icResiUserDao.selectOne(userWrapper);
-        if (null == icUser || !icUser.getHomeId().equals(formDTO.getHomeId())) {
+        //获取用户扫码的房屋
+        Result<IcHouseDTO> icHouseNewResult = govOrgOpenFeignClient.get(formDTO.getHomeId());
+        if (!icHouseNewResult.success() || null == icHouseNewResult.getData()) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
+        }
+        if (formDTO.getIdCard().equals(icHouseNewResult.getData().getOwnerIdCard())) {
+            //判断是否是房主
+            result.setIsOwner(NumConstant.ONE_STR);
+        }
+        if (null == icUser) {
             throw new EpmetException(EpmetErrorCode.MISMATCH.getCode(),
                     "人员与房屋信息不匹配，请与工作人员联系。",
                     "人员与房屋信息不匹配，请与工作人员联系。");
+        } else if (!icUser.getHomeId().equals(formDTO.getHomeId())) {
+            //获取用户当前所在的房屋
+            Result<IcHouseDTO> icHouseResult = govOrgOpenFeignClient.get(icUser.getHomeId());
+            if (!icHouseResult.success() || null == icHouseResult.getData()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
+            }
+            //判断两个房屋是否是一个房主
+            if (!StringUtils.equals(icHouseResult.getData().getOwnerIdCard(), icHouseNewResult.getData().getOwnerIdCard())) {
+                throw new EpmetException(EpmetErrorCode.MISMATCH.getCode(),
+                        "人员与房屋信息不匹配，请与工作人员联系。",
+                        "人员与房屋信息不匹配，请与工作人员联系。");
+            } else {
+                result.setIsDiff(NumConstant.ONE_STR);
+            }
         }
 
+
         //进入网格（entergrid）流程
         EnterGridFormDTO userInfoParams = new EnterGridFormDTO();
         userInfoParams.setUserId(formDTO.getUserId());
@@ -151,6 +182,7 @@ public class MyHomeServiceImpl implements MyHomeService {
             userResiInfoDTO.setApp("resi");
             userResiInfoService.saveResiInfo(userResiInfoDTO);
         }
+        return result;
     }
 
     /**
@@ -165,20 +197,21 @@ public class MyHomeServiceImpl implements MyHomeService {
     @Override
     public HomeInfoResultDTO getHomeInfo(TokenDto tokenDto) {
         HomeInfoResultDTO resultDto = new HomeInfoResultDTO();
+        //通过用户ID获取居民端用户信息
         ResiUserBaseInfoResultDTO baseInfo = userBaseInfoDao.selecUserBaseInfoByUserId(tokenDto.getUserId());
         if (null == baseInfo) {
             return resultDto;
         }
-
+        //通过居民身份证号获取居民信息
         LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcResiUserEntity::getCustomerId, tokenDto.getCustomerId());
         wrapper.eq(IcResiUserEntity::getIdCard, baseInfo.getIdNum());
         IcResiUserEntity icUser = icResiUserDao.selectOne(wrapper);
-
         if (null == icUser) {
             return resultDto;
         }
         resultDto.setIcResiUserId(icUser.getId());
+        //通过房屋ID获取房屋信息
         HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), icUser.getHomeId());
         if (null == houseInfo) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
@@ -187,6 +220,123 @@ public class MyHomeServiceImpl implements MyHomeService {
         resultDto.setHouseName(houseInfo.getAllName());
         resultDto.setHouseCode(houseInfo.getHouseCode());
         resultDto.setQrCodeUrl(houseInfo.getHouseQrcodeUrl());
+        //获取房屋房主信息，判断是否是房主
+        Result<IcHouseDTO> icHouseResult = govOrgOpenFeignClient.get(icUser.getHomeId());
+        if (!icHouseResult.success() || null == icHouseResult.getData()) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
+        }
+        if (icUser.getIdCard().equals(icHouseResult.getData().getOwnerIdCard())) {
+            resultDto.setIsOwner(NumConstant.ONE_STR);
+        } else {
+            resultDto.setIsOwner(NumConstant.ZERO_STR);
+        }
+        resultDto.setOwnerIdCard(icHouseResult.getData().getOwnerIdCard());
         return resultDto;
     }
+
+    /**
+     * 获取房主名下的房屋列表
+     *
+     * @param tokenDto
+     * @Param tokenDto
+     * @Return {@link List< HomeInfoResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/7/19 16:48
+     */
+    @Override
+    public List<HomeInfoResultDTO> getOwnerHouseList(TokenDto tokenDto, IcHouseDTO formDTO) {
+        //通过用户ID获取居民端用户信息
+        ResiUserBaseInfoResultDTO baseInfo = userBaseInfoDao.selecUserBaseInfoByUserId(tokenDto.getUserId());
+        if (null == baseInfo) {
+            return Collections.emptyList();
+        }
+
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setOwnerIdCard(baseInfo.getIdNum());
+        Result<List<HouseInfoDTO>> houseResult = govOrgOpenFeignClient.getOwnerHouseList(formDTO);
+        if (!houseResult.success()) {
+            throw new EpmetException(houseResult.getCode(), houseResult.getMsg());
+        }
+        if (CollectionUtils.isEmpty(houseResult.getData())) {
+            return Collections.emptyList();
+        }
+        List<HomeInfoResultDTO> list = houseResult.getData().stream().map(item -> {
+            HomeInfoResultDTO result = new HomeInfoResultDTO();
+            result.setHouseId(item.getHomeId());
+            result.setHouseName(item.getAllName());
+            result.setHouseCode(item.getHouseCode());
+            result.setQrCodeUrl(item.getHouseQrcodeUrl());
+            return result;
+        }).collect(Collectors.toList());
+        return list.stream().sorted((o1, o2) ->
+                Collator.getInstance(Locale.SIMPLIFIED_CHINESE)
+                        .compare(o1.getHouseName(),o2.getHouseName())).collect(Collectors.toList());
+    }
+
+    /**
+     * 变更绑定的房屋
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link List< HomeInfoResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/7/20 17:25
+     */
+    @Override
+    public void changeHome(TokenDto tokenDto, IcResiUserConfirmSubmitDTO formDTO) {
+        //通过用户ID获取居民端用户信息
+        ResiUserBaseInfoResultDTO baseInfo = userBaseInfoDao.selecUserBaseInfoByUserId(tokenDto.getUserId());
+        if (null == baseInfo) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");
+        }
+        //通过居民身份证号获取居民信息
+        LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcResiUserEntity::getCustomerId, tokenDto.getCustomerId());
+        wrapper.eq(IcResiUserEntity::getIdCard, baseInfo.getIdNum());
+        IcResiUserEntity icUser = icResiUserDao.selectOne(wrapper);
+        if (null == icUser) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息失败", "获取居民信息失败");
+        }
+
+        //通过房屋ID获取房屋信息
+        HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), formDTO.getHomeId());
+        if (null == houseInfo) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
+        }
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(houseInfo.getGridId());
+        if (null == gridInfo) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格信息失败", "获取网格信息失败");
+        }
+        //在添加调动记录的时候调整
+        icUser.setAgencyId(houseInfo.getAgencyId());
+        icUser.setPids(gridInfo.getPids());
+        icUser.setGridId(houseInfo.getGridId());
+        icUser.setVillageId(houseInfo.getNeighborHoodId());
+        icUser.setBuildId(houseInfo.getBuildingId());
+        icUser.setUnitId(houseInfo.getBuildingUnitId());
+        icUser.setHomeId(houseInfo.getHomeId());
+        icUser.setUpdatedTime(new java.util.Date());
+
+        //添加人员调动记录
+        IcResiUserTransferFormDTO transferDTO = new IcResiUserTransferFormDTO();
+        transferDTO.setCustomerId(tokenDto.getCustomerId());
+        transferDTO.setStaffId(tokenDto.getUserId());
+        transferDTO.setIcUserId(icUser.getId());
+        transferDTO.setType("in");
+        transferDTO.setNewAgencyId(houseInfo.getAgencyId());
+        transferDTO.setNewGridId(houseInfo.getGridId());
+        transferDTO.setNewNeighborHoodId(houseInfo.getNeighborHoodId());
+        transferDTO.setNewBuildingId(houseInfo.getBuildingId());
+        transferDTO.setNewBuildingUnitId(houseInfo.getBuildingUnitId());
+        transferDTO.setNewHouseId(houseInfo.getHomeId());
+        transferDTO.setTransferTime(new java.util.Date());
+        transferDTO.setRemark("更换房屋");
+        transferDTO.setReason("更换房屋");
+        transferDTO.setOrigin(IcResiUserConstant.CHANGE);
+        icUserTransferRecordService.add(transferDTO);
+        //更新家庭成员信息
+        icResiUserDao.updateById(icUser);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index c71227da0d..9b5b072806 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -445,7 +445,8 @@
             id_card,
             mobile,
             agency_id,
-            grid_id
+            grid_id,
+            home_id
         FROM
             ic_resi_user
         WHERE