人员图谱-个人详情里显示的房屋信息由显示本人是房东的房屋信息改为显示当前人员居住的房屋信息

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java

@@ -95,4 +95,7 @@ public class PersonDataResultDTO implements Serializable {
 
     @JsonIgnore
     private String gridId;
+
+    @JsonIgnore
+    private String homeId;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1143,11 +1143,25 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         personData.setIcResiUserId(formDTO.getUserId());
 
         // 房屋信息查询
-        Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard(), formDTO.getCustomerId());
+        //2022.9.14 应产品要求之前返的是这个人是房东的房屋信息，现在改成返回这个人当前居住的房屋信息  syc
+        /*Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard(), formDTO.getCustomerId());
         if (!listResult.success()) {
             throw new RenException("查询房屋信息失败");
         }
         personData.setHouseInfo(listResult.getData());
+        */
+        Set<String> houseIds = new HashSet<>();
+        houseIds.add(personData.getHomeId());
+        Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId());
+        if (!houseInfoRes.success()) {
+            throw new RenException("查询房屋信息失败");
+        }
+        List<String> houseInfo = new ArrayList<>();
+        if(null!=houseInfoRes.getData()&& !CollectionUtils.isEmpty(houseInfoRes.getData())){
+            houseInfo.add(houseInfoRes.getData().get(0).getAllName());
+        }
+        //2022.9.14  end
+        personData.setHouseInfo(houseInfo);
 
         // 志愿者处理
         if (personData.getIsVolunteer().equals(NumConstant.ONE_STR)) {

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -300,6 +300,7 @@
         <result column="isTenant" property="isTenant"/>
         <result column="CUSTOMER_ID" property="customerId"/>
         <result column="GRID_ID" property="gridId"/>
+        <result column="HOME_ID" property="homeId"/>
         <collection property="financialSituation" ofType="com.epmet.dto.FinancialSituationDTO">
             <result column="YSR" property="monthlyIncome"/>
             <result column="TXJE" property="retirementAmount"/>
@@ -316,7 +317,8 @@
             IS_TENANT as isTenant,
             IFNULL(IS_VOLUNTEER,'0') AS isVolunteer,
             CUSTOMER_ID,
-            GRID_ID
+            GRID_ID,
+            HOME_ID
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
           AND ID = #{userId}