From 777aa9e0c071d7bad2be5cd32cf5e2efd75e2130 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 3 Nov 2021 15:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=88=BF=E5=B1=8B=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/PersonDataResultDTO.java   |  7 +++++--
 .../epmet/service/impl/IcResiUserServiceImpl.java   | 13 +++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
index 22a6fc3c41..ae4082c383 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
@@ -52,7 +52,10 @@ public class PersonDataResultDTO implements Serializable {
     /**
      * 志愿者类别
      */
-    private String volunteerCategory;
+    private List<String> volunteerCategory;
+
+    @JsonIgnore
+    private List<String> volunteerCategoryEn;
 
     public PersonDataResultDTO() {
         this.workUnit = "";
@@ -61,7 +64,7 @@ public class PersonDataResultDTO implements Serializable {
         this.name = "";
         this.financialSituation = new FinancialSituationDTO();
         this.houseInfo = new ArrayList<>();
-        this.volunteerCategory = "";
+        this.volunteerCategory = new ArrayList<>();
     }
 
     /**
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 bed6dd6e50..d668fd4c71 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
@@ -964,9 +964,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      */
     @Override
     public PersonDataResultDTO personData(PersonDataFormDTO formDTO) {
-        baseDao.personData(formDTO.getUserId());
+        PersonDataResultDTO personData = baseDao.personData(formDTO.getUserId());
+        if (null == personData){
+            return new PersonDataResultDTO();
+        }
+        // 房屋信息查询
+        Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard());
+        if (!listResult.success()){
+            throw new RenException("查询房屋信息失败");
+        }
+        personData.setHouseInfo(listResult.getData());
         // TODO
-        return null;
+        return personData;
     }
 
     /**