From c2b22c9e33c95633320aa8beeb41947ab095322b Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 23 Nov 2022 10:30:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E5=AE=A2=E4=BF=A1=E6=81=AF=E5=85=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0=E5=88=B0=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RentContractInfoServiceImpl.java  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
index 8dceb69..616fc1d 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
@@ -302,17 +302,21 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
 
                 // 初始化居民信息
                 IcResiUserDTO user = new IcResiUserDTO();
+                user.setName(tenant.getName()); // 姓名
+                user.setMobile(tenant.getMobile()); // 手机
+                user.setIdCard(tenant.getIdCard()); // 证件号
+                user.setUnitId(contractDto.getUnitId()); // 工作单位
+                // 补充字段
+                user.setYhzgx(tenant.getYfzgx()); // 与房主关系
+                user.setIsParty(tenant.getPoliticalStatus()); // 政治面貌
+                user.setIsVeterans(tenant.getIsMilitary()); // 是否服过兵役
+
                 user.setCustomerId(loginUserUtil.getLoginUserCustomerId());
                 user.setGridId(contractDto.getGridId());
                 user.setVillageId(contractDto.getVillageId());
                 user.setBuildId(contractDto.getBuildId());
-                user.setUnitId(contractDto.getUnitId());
                 user.setHomeId(contractDto.getHomeId());
-                user.setName(tenant.getName());
-                user.setIdCard(tenant.getIdCard());
-                user.setMobile(tenant.getMobile());
                 user.setGender(IdCardNoValidatorUtils.getGender(tenant.getIdCard()));
-
                 user.setAgencyId(contractDto.getCommunityId());
                 Result<CustomerAgencyDTO> agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId());
                 user.setPids(agencyInfo.getData().getPids());