diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcHouseFormDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcHouseFormDTO.java
new file mode 100644
index 0000000000..5caca05c88
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcHouseFormDTO.java
@@ -0,0 +1,38 @@
+/**
+ * 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.commons.tools.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * epmet-user端调用gov-org端的入参
+ * @author sun
+ */
+@Data
+public class IcHouseFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private String customerId;
+	private String houseId;
+
+
+}
\ No newline at end of file
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonGovOrgFeignClient.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonGovOrgFeignClient.java
index bb6bfe423b..da09442ea8 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonGovOrgFeignClient.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonGovOrgFeignClient.java
@@ -2,8 +2,10 @@ package com.epmet.commons.tools.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.dto.form.CustomerGridFormDTO;
+import com.epmet.commons.tools.dto.form.IcHouseFormDTO;
 import com.epmet.commons.tools.feign.fallback.CommonGovOrgFeignClientFallBackFactory;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
+import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,4 +28,13 @@ public interface CommonGovOrgFeignClient {
     @PostMapping("/gov/org/grid/getbaseinfo")
     Result<GridInfoCache> getGridInfo(@RequestBody CustomerGridFormDTO customerGridFormDTO);
 
+    /**
+     * @Description 查询房屋信息
+     * @Param houseInfo
+     * @Return {@link Result<HouseInfoCache>}
+     * @Author zhaoqifeng
+     * @Date 2022/5/18 14:29
+     */
+    @PostMapping("/gov/org/house/getHouseInfoCache")
+    Result<HouseInfoCache> getHouseInfoCache(@RequestBody IcHouseFormDTO houseInfo);
 }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonGovOrgFeignClientFallback.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonGovOrgFeignClientFallback.java
index c54567c350..7f5097fd20 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonGovOrgFeignClientFallback.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonGovOrgFeignClientFallback.java
@@ -2,8 +2,10 @@ package com.epmet.commons.tools.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.dto.form.CustomerGridFormDTO;
+import com.epmet.commons.tools.dto.form.IcHouseFormDTO;
 import com.epmet.commons.tools.feign.CommonGovOrgFeignClient;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
+import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.stereotype.Component;
@@ -22,5 +24,18 @@ public class CommonGovOrgFeignClientFallback implements CommonGovOrgFeignClient
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInfo", customerGridFormDTO);
     }
 
+    /**
+     * @param houseInfo
+     * @Description 查询房屋信息
+     * @Param houseInfo
+     * @Return {@link Result< HouseInfoCache >}
+     * @Author zhaoqifeng
+     * @Date 2022/5/18 14:29
+     */
+    @Override
+    public Result<HouseInfoCache> getHouseInfoCache(IcHouseFormDTO houseInfo) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHouseInfoCache", houseInfo);
+    }
+
 
 }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java
index 6f2e4959e0..81cd3dd878 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java
@@ -1,11 +1,14 @@
 package com.epmet.commons.tools.redis.common;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.epmet.commons.tools.dto.form.IcHouseFormDTO;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.CommonAggFeignClient;
+import com.epmet.commons.tools.feign.CommonGovOrgFeignClient;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
+import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +31,8 @@ public class CustomerIcHouseRedis {
     private RedisUtils redisUtils;
     @Autowired
     private CommonAggFeignClient commonAggFeignClient;
+    @Autowired
+    private CommonGovOrgFeignClient govOrgFeignClient;
     private static CustomerIcHouseRedis customerIcHouseRedis;
 
     @PostConstruct
@@ -62,6 +67,35 @@ public class CustomerIcHouseRedis {
         return buildInfoResult.getData();
     }
 
+    /**
+     * @Description 获取房屋信息
+     * @Param customerId
+     * @Param houseId
+     * @Return {@link HouseInfoCache}
+     * @Author zhaoqifeng
+     * @Date 2022/5/18 14:37
+     */
+    public static HouseInfoCache getHouseInfo(String customerId, String houseId){
+        String key = RedisKeys.getHouseInfoCacheKey(houseId,customerId);
+        Map<String, Object> house = customerIcHouseRedis.redisUtils.hGetAll(key);
+        if (!MapUtils.isEmpty(house)) {
+            return ConvertUtils.mapToEntity(house, HouseInfoCache.class);
+        }
+        IcHouseFormDTO formDTO = new IcHouseFormDTO();
+        formDTO.setCustomerId(customerId);
+        formDTO.setHouseId(houseId);
+        Result<HouseInfoCache> houseInfoResult = customerIcHouseRedis.govOrgFeignClient.getHouseInfoCache(formDTO);
+        if (!houseInfoResult.success()){
+            throw new RenException("查询房屋信息失败...");
+        }
+        if (null == houseInfoResult.getData()){
+            return null;
+        }
+        Map<String, Object> map = BeanUtil.beanToMap(houseInfoResult.getData(), false, true);
+        customerIcHouseRedis.redisUtils.hMSet(key, map);
+        return houseInfoResult.getData();
+    }
+
     public static void delBuildingInfo(String buildingId){
         String key = RedisKeys.getBuildingInfoKey(buildingId);
         customerIcHouseRedis.redisUtils.delete(key);
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java
new file mode 100644
index 0000000000..4c6551b881
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java
@@ -0,0 +1,92 @@
+package com.epmet.commons.tools.redis.common.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 房屋信息缓存
+ * @author Administrator
+ */
+@Data
+public class HouseInfoCache implements Serializable {
+    /**
+     * 所属家庭Id
+     */
+    private String homeId;
+
+    /**
+     * 小区详细地址
+     */
+    private String neighborAddress;
+    /**
+     * 小区id
+     */
+    private String neighborHoodId;
+    /**
+     * 小区名称
+     */
+    private String neighborHoodName;
+
+
+    /**
+     * 所属楼栋id
+     */
+    private String buildingId;
+    /**
+     * 楼栋名称
+     */
+    private String buildingName;
+
+
+    /**
+     * 所属单元id
+     */
+    private String buildingUnitId;
+    /**
+     * 单元名
+     */
+    private String unitName;
+
+
+    /**
+     * 门牌号
+     */
+    private String doorName;
+
+    /**
+     * 房屋类型，1楼房，2平房，3别墅
+     */
+    private String houseType;
+
+    private String houseName;
+
+    /**
+     * 楼的经度
+     */
+    private String buildingLongitude;
+    /**
+     * 楼的纬度
+     */
+    private String buildingLatitude;
+
+    /**
+     * 小区名+楼栋名+单元名+房屋名
+     */
+    private String allName;
+
+    private String customerId;
+
+    /**
+     * 小区所在的组织id
+     */
+    private String agencyId;
+    /**
+     * eg：市北区-阜新路街道-南宁社区
+     */
+    private String agencyPathName;
+    /**
+     * 组织的area_code
+     */
+    private String areaCode;
+}
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 60c9bff074..5fb5deae73 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
@@ -30,11 +30,14 @@ import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.form.IcHouseFormDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
+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.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.poi.excel.handler.ExcelFillCellMergeStrategy;
@@ -288,6 +291,12 @@ public class HouseController implements ResultDataResolver {
         return new Result<HouseInfoDTO>().ok(houseService.getHouseInfoDTO(tokenDto.getCustomerId(), houseId));
     }
 
+    @PostMapping("getHouseInfoCache")
+    public Result<HouseInfoCache> getHouseInfoCache(@RequestBody IcHouseFormDTO houseInfo) {
+        HouseInfoDTO house = houseService.getHouseInfoDTO(houseInfo.getCustomerId(), houseInfo.getHouseId());
+        return new Result<HouseInfoCache>().ok(ConvertUtils.sourceToTarget(house, HouseInfoCache.class));
+    }
+
     /**
      * @Author sun
      * @Description 【人房】房屋总数饼图
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java
index 86a5d68c2d..72173dcad1 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java
@@ -1,7 +1,10 @@
 package com.epmet.resi.partymember.dto.partymember;
 
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -20,6 +23,7 @@ public class IcPartyMemberDTO implements Serializable {
     /**
      * 唯一标识
      */
+    @NotBlank(message = "当前网格id不能为空",groups ={UpdateGroup.class})
 	private String id;
 
     /**
@@ -50,16 +54,19 @@ public class IcPartyMemberDTO implements Serializable {
     /**
      * 姓名
      */
+    @NotBlank(message = "当前网格id不能为空",groups ={AddGroup.class, UpdateGroup.class})
 	private String name;
 
     /**
      * 手机号
      */
+    @NotBlank(message = "当前网格id不能为空",groups ={AddGroup.class, UpdateGroup.class})
 	private String mobile;
 
     /**
      * 身份证号
      */
+    @NotBlank(message = "当前网格id不能为空",groups ={AddGroup.class, UpdateGroup.class})
 	private String idCard;
 
     /**
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
index 63c2674043..d88cd797b3 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
@@ -2,6 +2,7 @@ package com.epmet.resi.partymember.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
@@ -114,4 +115,13 @@ public interface ResiPartyMemberOpenFeignClient {
     @PostMapping("/resi/partymember/partymemberconfirmmanual/audit-reset")
     Result<WarnAndPartyAuditResultDTO> partyMemberAuditReset(@RequestParam("gridId")String gridId);
 
+    /**
+     * @Description 同步党员信息
+     * @Param dto
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/5/18 10:41
+     */
+    @PostMapping("/resi/partymember/icPartyMember/icPartyMemberSync")
+    Result icPartyMemberSync(@RequestBody IcPartyMemberDTO dto);
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
index 2cb889e348..3a10c64914 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
@@ -3,6 +3,7 @@ package com.epmet.resi.partymember.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
@@ -74,4 +75,17 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
     public Result<WarnAndPartyAuditResultDTO> partyMemberAuditReset(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "partyMemberAuditReset", gridId);
     }
+
+    /**
+     * @param dto
+     * @Description 同步党员信息
+     * @Param dto
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/5/18 10:41
+     */
+    @Override
+    public Result icPartyMemberSync(IcPartyMemberDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "icPartyMemberSync", dto);
+    }
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
index 1da2c277bd..d3ad0f31e8 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
@@ -76,6 +76,9 @@ public class IcPartyMemberController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcPartyMemberExcel.class);
     }
 
-
-
+    @PostMapping("icPartyMemberSync")
+    public Result icPartyMemberSync(@RequestBody IcPartyMemberDTO dto) {
+        icPartyMemberService.icPartyMemberSync(dto);
+        return new Result();
+    }
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java
index 54b63e743e..d3d8cfc352 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java
@@ -75,4 +75,14 @@ public interface IcPartyMemberService extends BaseService<IcPartyMemberEntity> {
      * @date 2022-05-17
      */
     void delete(String[] ids);
+
+    /**
+     * 党员信息同步
+     *
+     * @Param dto
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/5/18 10:16
+     */
+    void icPartyMemberSync(IcPartyMemberDTO dto);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
index c4de661862..5f854e277e 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
@@ -151,4 +151,40 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 党员信息同步
+     *
+     * @param dto
+     * @Param dto
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/5/18 10:16
+     */
+    @Override
+    public void icPartyMemberSync(IcPartyMemberDTO dto) {
+        //查询党员信息
+        LambdaQueryWrapper<IcPartyMemberEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartyMemberEntity::getCustomerId, dto.getCustomerId());
+        wrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard());
+        IcPartyMemberEntity partyMember = baseDao.selectOne(wrapper);
+
+        //查询党组织信息
+        if (StringUtils.isNotBlank(dto.getSszb())) {
+            //获取党组织信息
+            IcPartyOrgEntity org = icPartyOrgService.selectById(dto.getSszb());
+            dto.setAgencyId(org.getAgencyId());
+            dto.setAgencyPids(org.getAgencyPids());
+            dto.setOrgPids(org.getOrgPids());
+        }
+        IcPartyMemberEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberEntity.class);
+
+        //判断党员是否已存在,有则更新，没有则添加
+        if (null != partyMember) {
+            entity.setId(partyMember.getId());
+            baseDao.updateById(entity);
+        } else {
+            baseDao.insert(entity);
+        }
+    }
+
 }
\ No newline at end of file
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 7285d59211..9f89b5ad1f 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
@@ -36,10 +36,12 @@ import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 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.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.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -59,6 +61,7 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.entity.*;
 import com.epmet.excel.support.ExportResiUserItemDTO;
 import com.epmet.feign.*;
+import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.service.*;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -137,6 +140,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private IcPartyMemberDao icPartyMemberDao;
     @Resource
     private IcVolunteerDao icVolunteerDao;
+    @Resource
+    private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
@@ -199,6 +204,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         String resiUserId = UUID.randomUUID().toString().replaceAll("-", "");
         String name = "";
         LinkedHashMap<String, String> map = new LinkedHashMap<>();
+        com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO partyMemberDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO();
         for (IcResiUserFormDTO d : formDTO) {
             if ("ic_resi_user".equals(d.getTableName())) {
                 map = d.getList().get(0);
@@ -233,7 +239,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     }
 
                 }
-                //2022.04.19 end
+
                 //查询组织信息
                 String agencyId = map.get("AGENCY_ID");
                 Result<CustomerAgencyDTO> result = govOrgOpenFeignClient.getAgencyById(agencyId);
@@ -244,6 +250,27 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
                 //新增主表数据
                 baseDao.add(d.getTableName(), map);
+
+                //2022.04.19 end
+                //2022.05.18 start zhaoqf 党员信息同步
+                partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
+                partyMemberDTO.setAgencyId(agencyId);
+                partyMemberDTO.setAgencyPids(result.getData().getPids());
+                partyMemberDTO.setIcResiUser(resiUserId);
+                partyMemberDTO.setName(map.get("NAME"));
+                partyMemberDTO.setIdCard(map.get("ID_CARD"));
+                partyMemberDTO.setMobile(map.get("MOBILE"));
+                //查询网格信息
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(map.get("GRID_ID"));
+                //查询房屋信息
+                HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), map.get("HOME_ID"));
+                if (null != gridInfo && null != houseInfo) {
+                    String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
+                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                    partyMemberDTO.setAddress(address);
+                }
+                //2022.05.18 end zhaoqf
             }
         }
         //2.循环字表新增数据
@@ -259,8 +286,29 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     baseDao.add(d.getTableName(), hash);
                 }
             }
+            //2022.05.18 start zhaoqf 党员信息同步
+            if ("ic_party_member".equals(d.getTableName())) {
+                for (LinkedHashMap<String, String> hash : d.getList()) {
+                        partyMemberDTO.setRdsj(hash.get("RDSJ"));
+                        partyMemberDTO.setSszb(hash.get("SSZB"));
+                        partyMemberDTO.setIsLd(hash.get("IS_LD"));
+                        partyMemberDTO.setLdzh(hash.get("LDZH"));
+                        partyMemberDTO.setPartyZw(hash.get("PARTY_ZW"));
+                        partyMemberDTO.setIsTx(hash.get("IS_TX"));
+                        partyMemberDTO.setIsDyzxh(hash.get("IS_DYZXH"));
+                }
+            }
+            if ("ic_volunteer".equals(d.getTableName())) {
+                for (LinkedHashMap<String, String> hash : d.getList()) {
+                        partyMemberDTO.setVolunteerCategory(hash.get("VOLUNTEER_CATEGORY"));
+                }
+            }
+            //2022.05.18 end zhaoqf
         });
-
+        Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
+        if (!syncResult.success()) {
+            log.error("同步党员信息失败");
+        }
         //3.变更记录表和变更记录明细表新增数据
         saveUserChangeRecord(tokenDto,map,resiUserId,name);
 
@@ -349,6 +397,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         //1.校验主表数据是否存在
         String resiUserId = "";
         LinkedHashMap<String, String> map = new LinkedHashMap<>();
+        com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO partyMemberDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO();
         for (IcResiUserFormDTO d : formDTO) {
             if ("ic_resi_user".equals(d.getTableName())) {
                 map = d.getList().get(0);
@@ -383,6 +432,50 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
                 //2022.04.19 end
                 resiUserId = map.get("ID");
+                //2022.05.18 start zhaoqf 党员信息同步
+                IcResiUserEntity icResiUser = baseDao.selectById(resiUserId);
+                partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
+                partyMemberDTO.setAgencyId(icResiUser.getAgencyId());
+                partyMemberDTO.setAgencyPids(icResiUser.getPids());
+                partyMemberDTO.setIcResiUser(resiUserId);
+                if (map.containsKey("NAME")) {
+                    partyMemberDTO.setName(map.get("NAME"));
+                } else {
+                    partyMemberDTO.setName(icResiUser.getName());
+                }
+                if (map.containsKey("ID_CARD")) {
+                    partyMemberDTO.setIdCard(map.get("ID_CARD"));
+                } else {
+                    partyMemberDTO.setIdCard(icResiUser.getIdCard());
+                }
+                if (map.containsKey("MOBILE")) {
+                    partyMemberDTO.setMobile(map.get("MOBILE"));
+                } else {
+                    partyMemberDTO.setMobile(icResiUser.getMobile());
+                }
+                //查询网格信息
+                String gridId = null;
+                if (map.containsKey("GRID_ID")) {
+                    gridId = map.get("GRID_ID");
+                } else {
+                    gridId = icResiUser.getGridId();
+                }
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId);
+                //查询房屋信息
+                String houseId = null;
+                if (map.containsKey("HOME_ID")) {
+                    houseId = map.get("HOME_ID");
+                } else {
+                    houseId = icResiUser.getHomeId();
+                }
+                HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), houseId);
+                if (null != gridInfo && null != houseInfo) {
+                    String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                    partyMemberDTO.setAddress(address);
+                }
+                //2022.05.18 end zhaoqf
             }
         }
         if (null == map) {
@@ -420,8 +513,29 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     }
                 }
             }
+            //2022.05.18 start zhaoqf 党员信息同步
+            if ("ic_party_member".equals(d.getTableName())) {
+                for (LinkedHashMap<String, String> hash : d.getList()) {
+                    partyMemberDTO.setRdsj(hash.get("RDSJ"));
+                    partyMemberDTO.setSszb(hash.get("SSZB"));
+                    partyMemberDTO.setIsLd(hash.get("IS_LD"));
+                    partyMemberDTO.setLdzh(hash.get("LDZH"));
+                    partyMemberDTO.setPartyZw(hash.get("PARTY_ZW"));
+                    partyMemberDTO.setIsTx(hash.get("IS_TX"));
+                    partyMemberDTO.setIsDyzxh(hash.get("IS_DYZXH"));
+                }
+            }
+            if ("ic_volunteer".equals(d.getTableName())) {
+                for (LinkedHashMap<String, String> hash : d.getList()) {
+                    partyMemberDTO.setVolunteerCategory(hash.get("VOLUNTEER_CATEGORY"));
+                }
+            }
+            //2022.05.18 end zhaoqf
         });
-
+        Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
+        if (!syncResult.success()) {
+            log.error("同步党员信息失败");
+        }
         return resiUserId;
     }